Changeset 9338 in orxonox.OLD for branches

Timestamp:

Jul 20, 2006, 12:03:24 AM (18 years ago)

Author:

patrick

Message:

proxy servers are synced in a better form

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (1 diff)
• monitor/network_node.cc (modified) (4 diffs)
• network_stream.cc (modified) (1 diff)
• synchronizeable_var/synchronizeable_ip.cc (modified) (1 diff)

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

@@ -69 +69 @@
       NetworkNode* node = new NetworkNode(peer);
       this->addNode( node);
-      this->addPassiveProxyServer( this->localNode, peer);
+      this->addActiveProxyServer( this->localNode, peer);
     }
   }

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

@@ -240 +240 @@
   {
     IP* ip = &(*it)->ip;
-    PRINT(0)("     - ms, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
+    PRINT(0)("     - ms, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -248 +248 @@
   {
     IP* ip = &(*it)->ip;
-    PRINT(0)("     - ps-a, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
+    PRINT(0)("     - ps-a, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -256 +256 @@
   {
     IP* ip = &(*it)->ip;
-    PRINT(0)("     - ps-p, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
+    PRINT(0)("     - ps-p, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
   }
 
@@ -264 +264 @@
   {
     IP* ip = &(*it)->ip;
-    PRINT(0)("     - client, id: %i (%s:9999)\n", (*it)->userId, ip->ipString().c_str());
-  }
-}
-
+    PRINT(0)("     - client, id: %i (%s)\n", (*it)->userId, ip->ipString().c_str());
+  }
+}
+

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

@@ -353 +353 @@
     // get the proxy server informations and write them to the handshake, if any (proxy)
     PeerInfo* pi = this->networkMonitor->getFirstChoiceProxy();
+    assert (pi != NULL);
     if( pi != NULL)
       peers[clientId].handshake->setProxy1Address( pi->ip);

branches/proxy/src/lib/network/synchronizeable_var/synchronizeable_ip.cc

@@ -88 +88 @@
   *this->vPtrOut = IP(host, port);
 
+  printf(" vtrp out old: %i, %i -- new: %i, %i\n", oldIP.ip(), oldIP.port(), this->vPtrOut->ip(), this->vPtrOut->port());
   setHasChanged( *this->vPtrOut != oldIP);