From 3565289c19974ca874f87429cc74a87558249c8e Mon Sep 17 00:00:00 2001
From: dec05eba <0xdec05eba@gmail.com>
Date: Fri, 19 Oct 2018 14:19:12 +0200
Subject: Use sendmsg and recvmsg instead of send and recv to receive one
 message at a time

---
 src/BootstrapConnection.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/BootstrapConnection.cpp')

diff --git a/src/BootstrapConnection.cpp b/src/BootstrapConnection.cpp
index 995fdcd..35bb11e 100644
--- a/src/BootstrapConnection.cpp
+++ b/src/BootstrapConnection.cpp
@@ -50,11 +50,11 @@ namespace sibs
     {
         if(messageType != MessageType::SUBSCRIBE)
         {
-            Log::warn("BootstrapConnection: received message from server that was not subscribe");
+            Log::warn("BootstrapConnection::receiveDataFromServer: received message from server that was not subscribe");
             return;
         }
 
-        Log::debug("BootstrapConnection: Received subscriber(s) from bootstrap node");
+        Log::debug("BootstrapConnection::receiveDataFromServer: Received subscriber(s) from bootstrap node");
         sibs::SafeDeserializer deserializer((const u8*)data, size);
         PubsubKey pubsubKey;
         deserializer.extract(pubsubKey.data.data(), PUBSUB_KEY_LENGTH);
@@ -64,13 +64,13 @@ namespace sibs
         auto listenerFuncIt = listenCallbackFuncs.find(pubsubKey);
         if(listenerFuncIt == listenCallbackFuncs.end())
         {
-            Log::debug("BoostrapConnection: No listener found for key '%s', ignoring...", pubsubKey.toString().c_str());
+            Log::debug("BootstrapConnection::receiveDataFromServer: No listener found for key '%s', ignoring...", pubsubKey.toString().c_str());
             return;
         }
         
         while(!deserializer.empty())
         {
-            sa_family_t addressFamily = deserializer.extract<u32>();
+            sa_family_t addressFamily = deserializer.extract<u16>();
             if(addressFamily == AF_INET)
             {
                 in_addr_t ipv4Address = deserializer.extract<u32>();
@@ -80,7 +80,7 @@ namespace sibs
                 newPeerAddress.address.sin_addr.s_addr = ipv4Address;
                 newPeerAddress.address.sin_port = port;
                 memset(newPeerAddress.address.sin_zero, 0, sizeof(newPeerAddress.address.sin_zero));
-                Log::debug("BootstrapConnection: received subscriber (ip: %s, port: %d) from bootstrap node", newPeerAddress.getAddress().c_str(), newPeerAddress.getPort());
+                Log::debug("BootstrapConnection::receiveDataFromServer: received subscriber (ip: %s, port: %d) from bootstrap node", newPeerAddress.getAddress().c_str(), newPeerAddress.getPort());
                 connections.connect(newPeerAddress, [this, pubsubKey](std::shared_ptr<DirectConnectionPeer> peer, PubSubResult result, const std::string &resultStr)
                 {
                     if(result == PubSubResult::OK)
@@ -88,15 +88,15 @@ namespace sibs
                         std::lock_guard<std::recursive_mutex> lock(subscribedPeersMutex);
                         subscribedPeers[pubsubKey].push_back(peer);
                         ++peer->sharedKeys;
-                        Log::debug("BootstrapConnection: Connected to peer (ip: %s, port: %d) given by bootstrap node", peer->address.getAddress().c_str(), peer->address.getPort());
+                        Log::debug("BootstrapConnection::receiveDataFromServer: Connected to peer (ip: %s, port: %d) given by bootstrap node", peer->address.getAddress().c_str(), peer->address.getPort());
                     }
                     else
-                        Log::error("BootstrapConnection: Failed to connect to peer given by bootstrap node, error: %s", resultStr.c_str());
+                        Log::error("BootstrapConnection::receiveDataFromServer: Failed to connect to peer given by bootstrap node, error: %s", resultStr.c_str());
                 }, std::bind(&BootstrapConnection::receiveDataFromPeer, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
             }
             else
             {
-                Log::error("BootstrapConnection: Unknown address family: %d", addressFamily);
+                Log::error("BootstrapConnection::receiveDataFromServer: Unknown address family: %d", addressFamily);
                 return;
             }
         }
@@ -116,7 +116,7 @@ namespace sibs
             if(listenerFuncIt == listenCallbackFuncs.end())
             {
                 listenerCallbackFuncMutex.unlock();
-                Log::debug("BoostrapConnection: No listener found for key '%s', ignoring...", pubsubKey.toString().c_str());
+                Log::debug("BootstrapConnection::receiveDataFromPeer: No listener found for key '%s', ignoring...", pubsubKey.toString().c_str());
                 return;
             }
             auto listenCallbackFunc = listenerFuncIt->second;
@@ -131,7 +131,7 @@ namespace sibs
         }
         else if(messageType == MessageType::UNSUBSCRIBE)
         {
-            Log::debug("BootstrapConnection: peer (ip: %s, port: %d) unsubscribed from key '%s'", peer->address.getAddress().c_str(), peer->address.getPort(), pubsubKey.toString().c_str());
+            Log::debug("BootstrapConnection::receiveDataFromPeer: peer (ip: %s, port: %d) unsubscribed from key '%s'", peer->address.getAddress().c_str(), peer->address.getPort(), pubsubKey.toString().c_str());
             std::lock_guard<std::recursive_mutex> subscribersMutex(subscribedPeersMutex);
             auto peersListIt = subscribedPeers.find(pubsubKey);
             if(peersListIt == subscribedPeers.end())
@@ -152,7 +152,7 @@ namespace sibs
         }
         else
         {
-            Log::warn("BootstrapConnection: received message from peer that was not data or unsubscribe");
+            Log::warn("BootstrapConnection::receiveDataFromPeer: received message from peer that was not data or unsubscribe");
         }
     }
     
-- 
cgit v1.2.3