Changeset 7777 in orxonox.OLD for branches/network/src

Timestamp:

May 23, 2006, 4:21:02 PM (18 years ago)

Author:

rennerc

Message:

added debug output

Location:

branches/network/src/lib/network

Files:

• handshake.cc (modified) (2 diffs)
• handshake.h (modified) (1 diff)
• network_stream.cc (modified) (3 diffs)
• udp_socket.cc (modified) (3 diffs)

branches/network/src/lib/network/handshake.cc

@@ -79 +79 @@
         localState.error = 1;
         localState.completed = 1;
-        localState.errorString = "Seems not to be orxonox!";
+        PRINTF(0)("orxId: %d:%d", remoteState.orxId, _ORXONOX_ID);
+        localState.errorString = "Seems not to be orxonox!\n";
         return;
       }
@@ -93 +94 @@
         localState.error = 2;
         localState.completed = 1;
-        localState.errorString = "Versions of server and client do not match!";
+        PRINTF(0)("version: %d:%d", remoteState.version, _ORXONOX_VERSION);
+        localState.errorString = "Versions of server and client do not match!\n";
         return;
       }

branches/network/src/lib/network/handshake.h

@@ -39 +39 @@
     inline int        getMessageManagerId(){ return remoteState.messageManagerId; }
     inline void       doReject( std::string reason ){ localState.error = 1; localState.errorString = "the server rejected your connection ["+ reason +"]"; }
+    inline std::string getErrorString(){ return remoteState.errorString; }
     
     virtual void varChangeHandler( std::list<int> & id );

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

@@ -341 +341 @@
             handleNewClient( it->second.userId );
 
-          PRINT(0)("handshake finished id=%d\n", it->second.handshake->getNetworkGameManagerId());
+          PRINTF(0)("handshake finished id=%d\n", it->second.handshake->getNetworkGameManagerId());
 
           delete it->second.handshake;
@@ -349 +349 @@
         else
         {
-          PRINT(1)("handshake failed!\n");
+          PRINTF(1)("handshake failed: %s!\n", it->second.handshake->getErrorString().c_str());
           it->second.socket->disconnectServer();
+          it->second.socket = NULL;
+          
+          delete it->second.handshake;
+          it->second.handshake = NULL;
         }
       }
@@ -422 +426 @@
     }
     
-    NETPRINTF(n)("adsf\n");
+    NETPRINTF(0)("adsf\n");
     
     assert( Converter::intToByteArray( offset, buf, INTSIZE ) == INTSIZE );
     
+    NETPRINTF(0)("adsf %d\n", offset);
+    
     assert( peer->second.socket->writePacket( buf, offset ) );
+    
+    NETPRINTF(0)("adsf\n");
     
     //peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );

branches/network/src/lib/network/udp_socket.cc

@@ -17 +17 @@
 #include "udp_server_socket.h"
 
+#include "network_log.h"
 
 void UdpSocket::init( )
@@ -151 +152 @@
 bool UdpSocket::writePacket( byte * data, int length )
 {
+  NETPRINTF(0)("adsf\n");
   if ( serverSocket )
   {
+    NETPRINTF(0)("adsf\n");
     NetworkPacket networkPacket;
     networkPacket.length = length;
     networkPacket.data = data;
+    NETPRINTF(0)("adsf\n");
     if ( !serverSocket->sendPacket( networkPacket, this->userId ) )
     {
+      NETPRINTF(0)("adsf\n");
       bOk = false;
       return false;
     }
     else
+    {
+      NETPRINTF(0)("adsf\n");
       return true;
+    }
+    NETPRINTF(0)("adsf\n");
   }
   else
   {
+    if ( !socket )
+      return false;
+    
+    NETPRINTF(0)("adsf\n");
     assert( length <= packet->maxlen );
     
+    NETPRINTF(0)("adsf\n");
     memcpy( packet->data, data, length );
+    NETPRINTF(0)("adsf\n");
     packet->len = length;
     
+    NETPRINTF(0)("adsf\n");
     if ( SDLNet_UDP_Send( socket, 1, packet) == 0 )
     {
+      NETPRINTF(0)("adsf\n");
       PRINTF(1)("SDLNet_UDP_Send: %s\n", SDLNet_GetError());
       bOk = false;
@@ -178 +195 @@
     }
     
+    NETPRINTF(0)("adsf\n");
     return true;
   }
+  NETPRINTF(0)("adsf\n");
 }