Changeset 9340 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 20, 2006, 10:09:43 AM (18 years ago)

Author:

patrick

Message:

network stream handshake init remastering and safer proxysettings init

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (2 diffs)

branches/proxy/src/lib/network/network_stream.cc

@@ -324 +324 @@
       clientId = freeSocketSlots.back();
       freeSocketSlots.pop_back();
-      peers[clientId].socket = tempNetworkSocket;
-      peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
-      peers[clientId].handshake->setUniqueID(clientId);
-
-      peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
-      peers[clientId].userId = clientId;
     }
     else
@@ -338 +332 @@
         if ( it->first >= clientId )
           clientId = it->first + 1;
-
-      peers[clientId].socket = tempNetworkSocket;
-      // handshake handling
-      peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
-      peers[clientId].handshake->setUniqueID(clientId);
-
-      peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
-      peers[clientId].userId = clientId;
-
-      PRINTF(0)("num sync: %d\n", synchronizeables.size());
-    }
-
+    }
+
+    peers[clientId].socket = tempNetworkSocket;
+      // create new handshake and init its variables
+    peers[clientId].handshake = new Handshake(this->pInfo->nodeType, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
+    peers[clientId].handshake->setUniqueID(clientId);
+
+    peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
+    peers[clientId].userId = clientId;
+
+    PRINTF(0)("num sync: %d\n", synchronizeables.size());
 
     // get the proxy server informations and write them to the handshake, if any (proxy)