Changeset 9548 in orxonox.OLD for branches/proxy/src

Timestamp:

Jul 28, 2006, 11:28:32 AM (18 years ago)

Author:

patrick

Message:

more docu and a much better debug interface

Location:

branches/proxy/src/lib/network

Files:

• README.NETWORK (modified) (2 diffs)
• network_stream.cc (modified) (4 diffs)

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

@@ -52 +52 @@
 The ids are created by the master/proxy servers. Each server receives an address space of 1000 nodes where it is able to assign nodes to. This address space could be extended quite easely, since we got plenty of numbers in 4bytes (integer)
 
+The handshake sync has always the uniqueId == userId. This is why there are some reserved uniqueIds
 
 
@@ -57 +58 @@
 =========
 uniqueId is an id (unique :D) for each synchronizeable to be identified in a network. the number space for uniqueIds goes from 0 to maxplayers - 1
+
+The handshake sync has always the uniqueId == userId. This is why there are some reserved uniqueIds
 
 

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

@@ -118 +118 @@
 
   this->pInfo = new PeerInfo();
-  this->pInfo->userId = 0;
+  this->pInfo->userId = NET_UID_UNASSIGNED;
   this->pInfo->lastAckedState = 0;
   this->pInfo->lastRecvedState = 0;
@@ -533 +533 @@
   }
 
+  PRINTF(0)("Current number of connections is: %i\n", this->peers.size());
+  for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
+  {
+    PRINTF(0)("peers[%i] with uniqueId %i and address: %s\n", it->first, it->second.userId, it->second.ip.ipString().c_str());
+  }
+
+
   PRINT(0)(" Got %i connected Synchronizeables, showing active Syncs:\n", this->synchronizeables.size());
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
@@ -643 +650 @@
               else if ( SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isClient() )
               {
-                PRINTF(0)("Handshake: i am in server role\n");
+                PRINTF(0)("Handshake: Proxy in server role: connecting %i, key: %i\n", it->second.userId, it->first);
 
                 it->second.ip = it->second.socket->getRemoteAddress();
@@ -685 +692 @@
 {
   this->bRedirect = false;
+#warning this peer will be created if it does not yet exist: dangerous
   PeerInfo* pInfo = &this->peers[userId];