Changeset 12020 for code/branches/PresentationFS18/src/libraries/network/ClientConnection.cc

Timestamp:

May 30, 2018, 2:56:24 PM (6 years ago)

Author:

patricwi

Message:

Merged Masterserver

Location:

code/branches/PresentationFS18

Files:

• . (modified) (1 prop)
• src/libraries/network/ClientConnection.cc (modified) (3 diffs)

code/branches/PresentationFS18/src/libraries/network/ClientConnection.cc

@@ -105 +105 @@
       {
         // manually add server to list of peers
-        /*incomingEvent inEvent = */Connection::preprocessConnectEvent(event);
-//         addPeer(inEvent.peerID);
+        Connection::preprocessConnectEvent(event);
+
         // start communication thread
         this->established_=true;
@@ -155 +155 @@
     assert( this->server_ );
     assert( packet );
-//     return Connection::addPacket( packet, NETWORK_PEER_ID_SERVER, channelID );
     // HACK: actually there should be a way to do this using addPacket and the correct peerID
     return Connection::broadcastPacket(packet, channelID);
@@ -168 +167 @@
     this->established_=false;
     orxout(internal_error, context::network) << "Received disconnect Packet from Server!" << endl;
-        // server closed the connection
+    // server closed the connection
     this->stopCommunicationThread();
     this->connectionClosed();