Changeset 9553 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

found a bug in the debug output and switched implementation

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (2 diffs)
• proxy/proxy_control.cc (modified) (2 diffs)

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

@@ -650 +650 @@
               else if ( SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isClient() )
               {
-                PRINTF(0)("Handshake: Proxy in server role: connecting %i, key: %i\n", it->second.userId, it->first);
+                PRINTF(0)("Handshake: Proxy in server role: connecting %i\n", it->second.userId);
 
                 it->second.ip = it->second.socket->getRemoteAddress();
@@ -657 +657 @@
 
                 // work with the ProxyControl to init the new client
-                PRINTF(0)("userId realy realy is: %i and key: %i\n", it->second.userId, it->first);
                 ProxyControl::getInstance()->signalNewClient( it->second.userId);
 

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

@@ -79 +79 @@
 void ProxyControl::signalNewClient(int userId)
 {
-  PRINTF(0)("Signaling new Client: %i\n");
+  PRINTF(0)("Signaling new Client: %i\n", userId);
   // make sure we are a proxy server
   assert(SharedNetworkData::getInstance()->isProxyServerActive());
 
-  byte * data = new byte[INTSIZE];
+  byte data[INTSIZE];
 
   assert( Converter::intToByteArray( userId, data + INTSIZE, INTSIZE ) == INTSIZE );
@@ -114 +114 @@
   assert( Converter::byteArrayToInt( data, &userId) == INTSIZE );
 
-  PRINTF(0)("Got Signal: new player arrived with userId: %i\n", userId);
+  PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, userId);
   // part for the master server
   if( SharedNetworkData::getInstance()->isMasterServer())