Changeset 9450 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 10:34:28 AM (18 years ago)

Author:

patrick

Message:

using the new id scheme

Location:

branches/proxy/src/lib/network

Files:

• README.NETWORK (modified) (1 diff)
• netdefs.h (modified) (2 diffs)
• network_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (9 diffs)
• network_stream.h (modified) (1 diff)

branches/proxy/src/lib/network/README.NETWORK

@@ -29 +29 @@
 NET_MAX_CONNECTION   Last client
 
+The proxy server ids are assigned as stated in the data/trunk/config/network_settings.conf, the first proxy server in the list gets the id NET_ID_PROXY_01 and so on.
+
 
 

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

@@ -62 +62 @@
 };
 
-//!< the type of the user id (special number never used elsewhere)
+//!< the type of the unique id (special number never used elsewhere)
 typedef enum {
   NET_UID_UNASSIGNED = -1,
+
+  NET_UID_HANDSHAKE  =  0,
+
 
   NET_UID_NUMBER
@@ -70 +73 @@
 
 
-//!< the id of the node
+//!< the network id list
 typedef enum nodeId {
   NET_ID_UNASSIGNED       =-1,

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

@@ -133 +133 @@
   this->networkStream->createServer( port);
   // and connect to the master server for synchronization
-  int userId = this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 9999);
+  this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 9999);
   // and to the other proxy servers also, this would be very nice if its works
 

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

@@ -182 +182 @@
  * @param port: the port number
  */
-int NetworkStream::connectToMasterServer(std::string host, int port)
-{
-  int node = this->peers.size();
+void NetworkStream::connectToMasterServer(std::string host, int port)
+{
+  int node = NET_ID_MASTER_SERVER;
   // this create the new node in the peers map
   this->peers[node].socket = new UdpSocket( host, port );
-  this->peers[node].userId = 0;
+  this->peers[node].userId = NET_ID_MASTER_SERVER;
 
   this->peers[node].nodeType = NET_MASTER_SERVER;
-  this->peers[node].connectionMonitor = new ConnectionMonitor( 0 );
+  this->peers[node].connectionMonitor = new ConnectionMonitor( NET_ID_MASTER_SERVER );
   this->peers[node].ip = this->peers[node].socket->getRemoteAddress();
-
-  return node;
 }
 
@@ -202 +200 @@
  * @param port: the port number
  */
-int NetworkStream::connectToProxyServer(std::string host, int port)
-{
-  int node = this->peers.size();
-  PRINTF(0)("connect to proxy %s, this is node %i\n", host.c_str(), node);
-
-  // this creates the new node in the peers map
-  this->peers[node].socket = new UdpSocket( host, port );
-  this->peers[node].userId = 0;
-
-  this->peers[node].nodeType = NET_PROXY_SERVER_ACTIVE;
-  this->peers[node].connectionMonitor = new ConnectionMonitor( 0 );
-  this->peers[node].ip = this->peers[node].socket->getRemoteAddress();
-
-  return node;
+void NetworkStream::connectToProxyServer(int proxyId,std::string host, int port)
+{
+  PRINTF(0)("connect to proxy %s, this is proxyId %i\n", host.c_str(), proxyId);
+
+  // this creates the new proxyId in the peers map
+  this->peers[proxyId].socket = new UdpSocket( host, port );
+  this->peers[proxyId].userId = proxyId;
+
+  this->peers[proxyId].nodeType = NET_PROXY_SERVER_ACTIVE;
+  this->peers[proxyId].connectionMonitor = new ConnectionMonitor( proxyId );
+  this->peers[proxyId].ip = this->peers[proxyId].socket->getRemoteAddress();
 }
 
@@ -250 +245 @@
 {
   Handshake* hs = new Handshake(this->pInfo->nodeType);
-  hs->setUniqueID( 0 );
+  // fake the unique id
+  hs->setUniqueID( NET_UID_HANDSHAKE );
   assert( peers[userId].handshake == NULL );
   peers[userId].handshake = hs;
@@ -327 +323 @@
   {
     // check if the connection is ok else terminate and remove
-    if ( !peers.empty() && peers[0].socket && ( !peers[0].socket->isOk() || peers[0].connectionMonitor->hasTimedOut() ) )
-    {
-      this->handleDisconnect( 0);
+#warning make this more modular: every proxy/master server connection should be watched for termination
+    if ( !peers.empty() && peers[NET_ID_MASTER_SERVER].socket &&
+          ( !peers[NET_ID_MASTER_SERVER].socket->isOk() ||
+          peers[NET_ID_MASTER_SERVER].connectionMonitor->hasTimedOut() ) )
+    {
+      this->handleDisconnect( NET_ID_MASTER_SERVER);
       PRINTF(1)("lost connection to server\n");
     }
@@ -335 +334 @@
     if( this->bRedirect)
     {
-      this->handleReconnect( 0);
+      this->handleReconnect( NET_ID_MASTER_SERVER);
     }
   }
@@ -625 +624 @@
   // disconnect from the current server and reconnect to proxy server
   this->handleDisconnect( userId);
-  this->connectToProxyServer(proxyIP.ipString(), 9999);
+  this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999);
   #warning the ports are not yet integrated correctly in the ip class
 
@@ -707 +706 @@
 
       // do not include synchronizeables with uninit id and syncs that don't want to be synchronized
-      if ( !sync.beSynchronized() || sync.getUniqueID() < 0 )
+      if ( !sync.beSynchronized() || sync.getUniqueID() <= NET_UID_UNASSIGNED )
         continue;
 
@@ -769 +768 @@
       Synchronizeable & sync = **it;
 
-      if ( !sync.beSynchronized() || sync.getUniqueID() < 0 )
+      // again exclude all unwanted syncs
+      if ( !sync.beSynchronized() || sync.getUniqueID() <= NET_UID_UNASSIGNED)
         continue;
 
@@ -969 +969 @@
         Synchronizeable & sync = **it;
 
-        if ( !sync.beSynchronized() || sync.getUniqueID() < 0 )
+        if ( !sync.beSynchronized() || sync.getUniqueID() <= NET_UID_UNASSIGNED )
           continue;
 

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

@@ -41 +41 @@
     void init();
 
-    int connectToMasterServer(std::string host, int port);
-    int connectToProxyServer(std::string host, int port);
+    void connectToMasterServer(std::string host, int port);
+    void connectToProxyServer(int proxyId, std::string host, int port);
     void createServer(int port);
 
     void createNetworkGameManager();
-    void startHandshake(int userId = 0);
+    void startHandshake(int userId = NET_ID_MASTER_SERVER);
 
     /* synchronizeable interface */