Додано можливість стирання не доставлених повідомлень за тайм-аутом

[stg.git] / projects / rscriptd / listener.cpp

diff --git a/projects/rscriptd/listener.cpp b/projects/rscriptd/listener.cpp
index 8737b3b8aae2c6d4893e8e8a249bce445b21d892..aca5da445c4dec4346d4c38dc9cd0374313f7c56 100644 (file)
--- a/projects/rscriptd/listener.cpp
+++ b/projects/rscriptd/listener.cpp
@@ -323,7 +323,7 @@ if (strncmp((char *)packetTail.magic, RS_ID, RS_MAGIC_LEN))
 std::stringstream params;
 params << data.login << " "
        << inet_ntostring(data.ip) << " "
-       << ntohl(data.id) << " "
+       << data.id << " "
        << (char *)packetTail.params;
 
 data.params = params.str();
@@ -333,9 +333,16 @@ return false;
 //-----------------------------------------------------------------------------
 void LISTENER::ProcessPending()
 {
-printfd(__FILE__, "Pending data size: %d\n", pending.size());
-std::list<PendingData>::iterator it(pending.begin());
-while (it != pending.end())
+std::list<PendingData> localPending;
+
+    {
+    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+    printfd(__FILE__, "Pending data size: %d\n", pending.size());
+    localPending.swap(pending);
+    }
+
+std::list<PendingData>::iterator it(localPending.begin());
+while (it != localPending.end())
     {
     std::vector<AliveData>::iterator uit(
             std::lower_bound(
@@ -375,9 +382,7 @@ while (it != pending.end())
             users.erase(uit);
             }
         }
-
-    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
-    pending.erase(it++);
+    ++it;
     }
 }
 //-----------------------------------------------------------------------------