TeaSpeak/TeaSpeakLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.did.science/WolverinDEV/TeaSpeak-SharedLib

Browse Source
This commit is contained in:
WolverinDEV 2019-07-06 15:08:25 +02:00
commit 90a5ee0cbe
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/misc/spin_lock.h
View File

@ -9,7 +9,12 @@ class spin_lock {
inline void lock() { inline void lock() {
uint8_t round = 0; uint8_t round = 0;
while (locked.test_and_set(std::memory_order_acquire)) { while (locked.test_and_set(std::memory_order_acquire)) {
while(locked._M_i) { /* waiting 'till its zero so we can try an exchanged again; Atomic exchanges have a huge bug overhead to deal with! */ /* waiting 'till its zero so we can try an exchanged again; Atomic exchanges have a huge bug overhead to deal with! */
#ifdef WIN32
while(locked._My_flag > 0) {
#else
while(locked._M_i) {
#endif
//Yield when we're using this lock for a longer time, which we usually not doing //Yield when we're using this lock for a longer time, which we usually not doing
if(round++ % 8 == 0) if(round++ % 8 == 0)
std::this_thread::yield(); std::this_thread::yield();

4
src/protocol/CryptionHandler.cpp
View File

@ -174,8 +174,8 @@ bool CryptionHandler::generate_key_nonce(
uint8_t (& nonce)[16] uint8_t (& nonce)[16]
) { ) {
if (this->useDefaultChipherKeyNonce || use_default) { if (this->useDefaultChipherKeyNonce || use_default) {
memcpy(key, this->default_key, 16); memcpy(key, CryptionHandler::default_key, 16);
memcpy(nonce, this->default_nonce, 16); memcpy(nonce, CryptionHandler::default_nonce, 16);
return true; return true;
} }