Changeset 9605 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 29, 2006, 11:46:07 AM (18 years ago)

Author:

patrick

Message:

MARK: there seems to be still a bug in the permissions system. trying to trace

File:

• branches/proxy/src/lib/network/network_stream.cc (modified) (2 diffs)

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

@@ -767 +767 @@
 /**
  * this functions handles a reconnect event received from the a NET_MASTER_SERVER or NET_PROXY_SERVER
+ * @param userId
  */
 void NetworkStream::handleReconnect(int userId)
@@ -792 +793 @@
   // disconnect from the current server and reconnect to proxy server
   this->handleDisconnect( userId);
-//   this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999);
-  this->connectToMasterServer(proxyIP.ipString(), 9999);
+  this->connectToProxyServer(NET_ID_PROXY_SERVER_01, proxyIP.ipString(), 9999);
+//   this->connectToMasterServer(proxyIP.ipString(), 9999);
   #warning the ports are not yet integrated correctly in the ip class