Changeset 9404 in orxonox.OLD

Timestamp:

Jul 24, 2006, 10:05:52 AM (18 years ago)

Author:

patrick

Message:

yet another strang bug occured. flush

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (2 diffs)
• monitor/network_monitor.h (modified) (2 diffs)
• monitor/network_node.cc (modified) (2 diffs)
• monitor/network_node.h (modified) (1 diff)
• network_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (1 diff)

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -33 +33 @@
 SHELL_COMMAND(showGUI, NetworkMonitor, showGUI);
 SHELL_COMMAND(hideGUI, NetworkMonitor, hideGUI);
-// SHELL_COMMAND(output, MappedWater, saveParams);
+SHELL_COMMAND(debug, NetworkMonitor, debug);
 
 
@@ -106 +106 @@
     if( *it == node)
     {
+      if( node->getNodeType() == NET_CLIENT)
+        this->playerNumber--;
+
       this->nodeList.erase(it);
-      this->playerNumber--;
       return;
     }

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -65 +65 @@
     inline int getPlayerNumber() { return this->playerNumber; }
 
-    /** @returns true if there are still free network slots available */
+    /** @returns true if there are still free network slots available at the local node*/
     inline bool gotFreeSlots() { return (this->localNode->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
     /** @param node node to be checked for slots @returns true if there are still free network slots available at this node */
@@ -89 +89 @@
 
     int                          playerNumber;                 //!< total number of players in the game
+    int                          connectionNumber;             //!< total number of connections at this localhost
 };
 

branches/proxy/src/lib/network/monitor/network_node.cc

@@ -43 +43 @@
   this->clientList.push_back(node);
   this->playerNumber++;
+  this->connectionNumber++;
 }
 
@@ -51 +52 @@
 {
   this->activeProxyServerList.push_back(node);
-  this->playerNumber++;
+  this->connectionNumber++;
 }
 

branches/proxy/src/lib/network/monitor/network_node.h

@@ -59 +59 @@
   private:
     int                          playerNumber;                 //!< localy direct connected player number
+    int                          connectionNumber;             //!< number of connections ( can but musn't be equal players)
     PeerInfo*                    peerInfo;                     //!< the peer informationa about this node
 

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

@@ -105 +105 @@
 int NetworkManager::createMasterServer(unsigned int port)
 {
-  // init the proxy settings data do this before everything else is done here
-  NetworkSettings::getInstance()->loadData();
-
   // create the network stream
   this->networkStream = new NetworkStream(NET_MASTER_SERVER);

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

@@ -720 +720 @@
       // server fakes uniqueid == 0 for handshake
       if ( ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServer() ) &&
-             sync.getUniqueID() <= SharedNetworkData::getInstance()->getMaxPlayer())
+             sync.getUniqueID() <= SharedNetworkData::getInstance()->getMaxPlayer() + 1) // plus one to handle one client more than the max to redirect it
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
       else