X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/d1d9452a687184ac6b992fadc77e89c8a308e388..005739f70a1d33ff4babbb3e6152fc6063aa480b:/projects/rscriptd/listener.cpp diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp index 9fe4c0f0..222a02eb 100644 --- a/projects/rscriptd/listener.cpp +++ b/projects/rscriptd/listener.cpp @@ -16,7 +16,7 @@ /* * Author : Boris Mikhailenko <stg34@stargazer.dp.ua> - * Author : Maxim Mamontov <faust@stargazer.dp.ua> + * Author : Maksym Mamontov <stg@madf.info> */ #include <arpa/inet.h> @@ -311,7 +311,7 @@ else if (packetHead.packetType == RS_DISCONNECT_PACKET) } } -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); pending.push_back(data); return false; @@ -396,6 +396,7 @@ while (it != pending.end() && count < 256) { printfd(__FILE__, "Disconnect user '%s'\n", it->login.c_str()); // Disconnect existing user + uit->params = it->params; Disconnect(*uit); users.erase(uit); } @@ -411,7 +412,7 @@ while (it != pending.end() && count < 256) ++it; ++count; } -STG_LOCKER lock(&mutex, __FILE__, __LINE__); +STG_LOCKER lock(&mutex); pending.erase(pending.begin(), it); } //-----------------------------------------------------------------------------