Minor fixes

diff --git a/src/UDPConnection.cpp b/src/UDPConnection.cpp
index 4f39d6d189d9c3c0b3f8ac7e21369a3a3ff129c5..558f2694584380578e144b9df6b9e75c22afd1cf 100644 (file)
--- a/src/UDPConnection.cpp
+++ b/src/UDPConnection.cpp
@@ -226,11 +226,10 @@ atostrBufIndex(0),
 receivedPkts(),
 cSendPkts(),
 rng_engine(),
-conMapMutex()
+conMapMutex(),
+peerPKWhitelistMutex()
 {
-    for(unsigned int i = 0; i < UDPC_ATOSTR_SIZE; ++i) {
-        atostrBuf[i] = 0;
-    }
+    std::memset(atostrBuf, 0, UDPC_ATOSTR_SIZE);
 
     if(isThreaded) {
         flags.set(0);
@@ -484,7 +483,7 @@ void UDPC::Context::update_impl() {
                 idMap.erase(cIter->second.id);
             }
             if(isReceivingEvents.load()) {
-                if(flags.test(1) && !cIter->second.flags.test(4)) {
+                if(flags.test(1) && cIter->second.flags.test(3)) {
                     externalEvents.push(UDPC_Event{
                         UDPC_ET_FAIL_CONNECT, *iter, false});
                 } else {
@@ -1045,8 +1044,13 @@ void UDPC::Context::update_impl() {
                 }
             }
             if(isReceivingEvents.load()) {
-                externalEvents.push(UDPC_Event{
-                    UDPC_ET_DISCONNECTED, iter->first, false});
+                if(flags.test(1) && iter->second.flags.test(3)) {
+                    externalEvents.push(UDPC_Event{
+                        UDPC_ET_FAIL_CONNECT, iter->first, false});
+                } else {
+                    externalEvents.push(UDPC_Event{
+                        UDPC_ET_DISCONNECTED, iter->first, false});
+                }
             }
             conMap.erase(iter);
         }