Fixed memory leak in TCPServer::AcceptNewConnections caused by acceptor->async_accept().

Fixed some formating and comments.

include/Engine/Network/TCPServer.h

@@ -22,10 +22,9 @@ private:
     std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
     boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
 
-    void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket,
-        int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-        const boost::system::error_code& error);
     int readBuffer(char* data, PlayerDefinition& playerDefinition);
+    PlayerID getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+        boost::asio::ip::address address, unsigned short port);
 };
 
 #endif

src/Engine/Network/Client.cpp

@@ -250,7 +250,7 @@ void Client::parseDoubleJump(Packet & packet)
     }
     Events::DoubleJump e;
     e.entityID = m_ServerIDToClientID.at(serverID);
-    // If player is local player to publish to prevent infinite feedback loop
+    // If player is local player do not publish to prevent infinite feedback loop
     if (e.entityID != m_LocalPlayer.ID) {
         m_EventBroker->Publish(e);
     }
@@ -333,6 +333,7 @@ void Client::parseSnapshot(Packet& packet)
 
                 // Update entity
                 if (m_World->HasComponent(localEntityID, componentType)) {
+                    // TODO Fix memory leak here
                     SharedComponentWrapper newComponent = createSharedComponent(packet, localEntityID, componentInfo);
                     bool shouldApply = true;
                     // Apply potential filter function
@@ -343,6 +344,7 @@ void Client::parseSnapshot(Packet& packet)
                         ComponentWrapper currentComponent = m_World->GetComponent(localEntityID, componentType);
                         memcpy(currentComponent.Data, newComponent.Data, componentInfo.Stride);
                     }
+
                     //if (localEntity != m_LocalPlayer && !localEntity.IsChildOf(m_LocalPlayer)) {
                     //    updateFields(packet, componentInfo, localEntityID);
                     //} else {
@@ -371,9 +373,11 @@ void Client::parseSnapshot(Packet& packet)
         // This should be enough beacause we know that the entities arives in pre-order (there will always be a parent)
         if (serverParentID != EntityID_Invalid) {
             EntityID localEntityID = m_ServerIDToClientID.at(serverEntityID);
+            if (m_World->GetParent(localEntityID) != m_ServerIDToClientID.at(serverParentID)) {
                 m_World->SetParent(localEntityID, m_ServerIDToClientID.at(serverParentID));
             }
         }
+    }
     parseSpawnEvents();
 }
 
@@ -461,7 +465,7 @@ void Client::parsePlayerDamage(Packet& packet)
     Events::PlayerDamage e;
     PlayerID victimID = packet.ReadPrimitive<EntityID>();
     PlayerID inflictorID = packet.ReadPrimitive<EntityID>();
-    if(!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)){
+    if (!serverClientMapsHasEntity(victimID) || !serverClientMapsHasEntity(inflictorID)) {
         return;
     }
     e.Inflictor = EntityWrapper(m_World, m_ServerIDToClientID.at(victimID));

src/Engine/Network/Server.cpp

@@ -28,9 +28,8 @@ Server::~Server()
 
 void Server::Update()
 {
-    PlayerDefinition pd;
-
     m_Reliable.AcceptNewConnections(m_NextPlayerID, m_ConnectedPlayers);
+
     for (auto& kv : m_ConnectedPlayers) {
         while (kv.second.TCPSocket->available()) {
             // Packet will get real data in receive
@@ -46,6 +45,7 @@ void Server::Update()
         }
     }
 
+    PlayerDefinition pd;
     while (m_Unreliable.IsSocketAvailable()) {
         // Packet will get real data in receive
         Packet packet(MessageType::Invalid);

src/Engine/Network/TCPServer.cpp

@@ -4,22 +4,33 @@ using namespace boost::asio::ip;
 TCPServer::TCPServer()
 {
     acceptor = std::unique_ptr<tcp::acceptor>(new tcp::acceptor(m_IOService, tcp::endpoint(tcp::v4(), 27666)));
+    // Make the acceptor non-blocking so we wont get stuck in AcceptNewConnections().
+    acceptor->non_blocking(true);
 }
 
 TCPServer::~TCPServer()
-{
+{ }
-}
 
 void TCPServer::AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers)
 {
+    boost::system::error_code error;
     boost::shared_ptr<tcp::socket> newSocket = boost::shared_ptr<tcp::socket>(new tcp::socket(m_IOService));
-    m_IOService.poll();
+    acceptor->accept(*newSocket, error);
-    acceptor->async_accept(*newSocket,
+    // If no error occured add new tcp connection
-        boost::bind(&TCPServer::handle_accept, this, newSocket, boost::ref(nextPlayerID), boost::ref(connectedPlayers),
+    if (!error) {
-            boost::asio::placeholders::error));
+        // Add tcp socket to connections
+        boost::asio::ip::tcp::no_delay option(true);
+        newSocket->set_option(option);
+        PlayerDefinition pd;
+        pd.StopTime = std::clock();
+        pd.TCPSocket = newSocket;
+        pd.TCPAddress = newSocket.get()->remote_endpoint().address();
+        pd.TCPPort = newSocket.get()->remote_endpoint().port();
+        connectedPlayers[nextPlayerID++] = pd;
+    }
 }
 
-PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
+PlayerID TCPServer::getPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& connectedPlayers,
     boost::asio::ip::address address, unsigned short port)
 {
     for (auto& kv : connectedPlayers) {
@@ -31,24 +42,6 @@ PlayerID GetPlayerIDFromEndpoint(const std::map<PlayerID, PlayerDefinition>& con
     return -1;
 }
 
-void TCPServer::handle_accept(boost::shared_ptr<tcp::socket> socket, 
-    int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
-    const boost::system::error_code& error)
-{
-    if (!error && GetPlayerIDFromEndpoint(connectedPlayers, socket->remote_endpoint().address(),
-        socket->remote_endpoint().port()) == -1) {
-        // Add tcp socket to connections
-        boost::asio::ip::tcp::no_delay option(true);
-        socket->set_option(option);
-        PlayerDefinition pd;
-        pd.StopTime = std::clock();
-        pd.TCPSocket = socket;
-        pd.TCPAddress = socket.get()->remote_endpoint().address();
-        pd.TCPPort = socket.get()->remote_endpoint().port();
-        connectedPlayers[nextPlayerID++] = pd;
-    }
-}
-
 void TCPServer::Send(Packet & packet, PlayerDefinition & playerDefinition)
 {
     try {