Changeset 9465 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 8:17:29 PM (18 years ago)

Author:

patrick

Message:

added more secure implementation of connection update

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (1 diff)

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

@@ -372 +372 @@
   //check for new connections
 
-  NetworkSocket* tempNetworkSocket = this->clientSocket->getNewSocket();
+  NetworkSocket* tempNetworkSocket = NULL;
   int userId;
 
-  // we got new NET_CLIENT connecting
-  if ( tempNetworkSocket )
-  {
-    // determine the network node id
-    if ( freeSocketSlots.size() > 0 )
-    {
-      userId = freeSocketSlots.back();
-      freeSocketSlots.pop_back();
-    }
-    else
-    {
-      userId = 1;
-
-      for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
-        if ( it->first >= userId )
-          userId = it->first + 1;
-    }
-    // this creates a new entry in the peers list
-    peers[userId].socket = tempNetworkSocket;
-    this->handleConnect(userId);
-
-    PRINTF(0)("New Client: %d\n", userId);
-  }
-
-  tempNetworkSocket = this->proxySocket->getNewSocket();
-
-  // we got new NET_PROXY_SERVER_ACTIVE connecting
-  if ( tempNetworkSocket )
-  {
-    // determine the network node id
-    if ( freeSocketSlots.size() > 0 )
-    {
-      userId = freeSocketSlots.back();
-      freeSocketSlots.pop_back();
-    }
-    else
-    {
-      userId = 1;
-
-      for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
-        if ( it->first >= userId )
-          userId = it->first + 1;
-    }
-
-    // this creates a new entry in the peers list
-    peers[userId].socket = tempNetworkSocket;
-    this->handleConnect(userId);
-
-    PRINTF(0)("New Proxy: %d\n", userId);
-  }
-
+  if( this->clientSocket != NULL)
+  {
+    tempNetworkSocket = this->clientSocket->getNewSocket();
+
+    // we got new NET_CLIENT connecting
+    if ( tempNetworkSocket )
+    {
+      // determine the network node id
+      if ( freeSocketSlots.size() > 0 )
+      {
+        userId = freeSocketSlots.back();
+        freeSocketSlots.pop_back();
+      }
+      else
+      {
+        userId = 1;
+
+        for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
+          if ( it->first >= userId )
+            userId = it->first + 1;
+      }
+      // this creates a new entry in the peers list
+      peers[userId].socket = tempNetworkSocket;
+      this->handleConnect(userId);
+
+      PRINTF(0)("New Client: %d\n", userId);
+    }
+  }
+
+
+  if( this->proxySocket != NULL)
+  {
+    tempNetworkSocket = this->proxySocket->getNewSocket();
+
+    // we got new NET_PROXY_SERVER_ACTIVE connecting
+    if ( tempNetworkSocket )
+    {
+      // determine the network node id
+      if ( freeSocketSlots.size() > 0 )
+      {
+        userId = freeSocketSlots.back();
+        freeSocketSlots.pop_back();
+      }
+      else
+      {
+        userId = 1;
+
+        for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
+          if ( it->first >= userId )
+            userId = it->first + 1;
+      }
+
+      // this creates a new entry in the peers list
+      peers[userId].socket = tempNetworkSocket;
+      this->handleConnect(userId);
+
+      PRINTF(0)("New Proxy: %d\n", userId);
+    }
+  }