Changeset 9327 in orxonox.OLD

Timestamp:

Jul 18, 2006, 4:29:59 PM (18 years ago)

Author:

patrick

Message:

player number model switched

Location:

branches/proxy/src/lib/network

Files:

• handshake.cc (modified) (1 diff)
• monitor/network_monitor.h (modified) (2 diffs)
• network_stream.cc (modified) (3 diffs)
• network_stream.h (modified) (2 diffs)
• shared_network_data.cc (modified) (1 diff)

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

@@ -11 +11 @@
 ### File Specific:
    main-programmer: Christoph Renner (rennerc@ee.ethz.ch)
+   co-programmer: Patirck Boenzli (boenzlip@orxonox.ethz.ch)
 */
 

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

@@ -9 +9 @@
 #include "base_object.h"
 #include "synchronizeable.h"
+#include "shared_network_data.h"
 
 #include "network_node.h"
@@ -58 +59 @@
 
     /** @returns true if there are still free network slots available */
-    inline bool gotFreeSlots() { return (this->localNode->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
+    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 */
-    inline bool gotFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
+    inline bool gotFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
     PeerInfo* getFirstChoiceProxy();
     PeerInfo* getSecondChoiceProxy();
     /** @returns true if the next client should be reconnected to some other proxy server with more connections */
-    inline bool reconnectNextClient() { return (this->localNode->getPlayerNumber() >= NET_MAX_CONNECTIONS)?true:false; }
+    inline bool reconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
 
 

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

@@ -364 +364 @@
 
     // check if there are too many clients connected (DEPRECATED: new: the masterserver sends a list of proxy servers)
-    if ( clientId > NET_MAX_CONNECTIONS )
+    if ( clientId > SharedNetworkData::getInstance()->getMaxPlayer() )
     {
 //       peers[clientId].handshake->setRedirect(true);
@@ -449 +449 @@
                (*it)->getUniqueID(), (*it)->beSynchronized());
   }
-  PRINT(0)(" Maximal Connections: %i\n", NET_MAX_CONNECTIONS );
+  PRINT(0)(" Maximal Connections: %i\n", SharedNetworkData::getInstance()->getMaxPlayer() );
 
 }
@@ -620 +620 @@
 
       // server fakes uniqueid == 0 for handshake
-      if ( this->isMasterServer() && sync.getUniqueID() < NET_MAX_CONNECTIONS - 1 )
+      if ( this->isMasterServer() && sync.getUniqueID() < SharedNetworkData::getInstance()->getMaxPlayer() - 1 )
         n = Converter::intToByteArray( 0, buf + offset, UDP_PACKET_SIZE - offset );
       else

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

@@ -17 +17 @@
 #include "udp_server_socket.h"
 #include "peer_info.h"
+
+#include "shared_network_data.h"
 
 class Synchronizeable;
@@ -52 +54 @@
     inline bool isClient() const { return (this->pInfo->nodeType == NET_CLIENT)? true:false; }
 //     inline bool isActive() const { return this->bActive; }
-    inline int getMaxConnections(){ return NET_MAX_CONNECTIONS; }
+    inline int getMaxConnections(){ return SharedNetworkData::getInstance()->getMaxPlayer(); }
 
     /* functions for the peerInfo information retreival */

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

@@ -35 +35 @@
   this->hostID = -1;
   this->defaultSyncStream = NULL;
-  this->newUniqueID = NET_MAX_CONNECTIONS + 2;
+  this->newUniqueID = SharedNetworkData::getInstance()->getMaxPlayer() + 2;
   this->nodeType = NET_CLIENT;
 }