Changeset 9340 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

network stream handshake init remastering and safer proxysettings init

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (2 diffs)
• proxy/proxy_settings.cc (modified) (1 diff)
• proxy/proxy_settings.h (modified) (1 diff)

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)

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

@@ -34 +34 @@
   /* set the class id for the base object */
   this->setClassID(CL_PROXY_SETTINGS, "ProxySettings");
+  // suggest a good standard max players value
+  this->maxPlayer = 10;
 }
 

branches/proxy/src/lib/network/proxy/proxy_settings.h

@@ -44 +44 @@
 
   private:
-
-    static ProxySettings*       singletonRef;            //!< Pointer to the only instance of this Class
-
-    int                         maxPlayer;               //!< maximal number of players
-
+    static ProxySettings*        singletonRef;            //!< Pointer to the only instance of this Class
+    int                          maxPlayer;               //!< maximal number of players
     std::vector<IPaddress*>      proxies;                 //!< all registered proxies