Changeset 7774 in orxonox.OLD for branches/network

Timestamp:

May 23, 2006, 3:10:57 PM (19 years ago)

Author:

rennerc

Message:

added some debug output to handshake

Location:

branches/network/src/lib/network

Files:

• handshake.cc (modified) (5 diffs)
• network_stream.cc (modified) (1 diff)

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

@@ -22 +22 @@
 #include "handshake.h"
 
+#include "network_log.h"
+
 #include <cassert>
 
@@ -41 +43 @@
   errorString_handler = registerVarId( new SynchronizeableString( &localState.errorString, &remoteState.errorString, "errorString", PERMISSION_ALL ) );
   
-  localState.completed = false;
+  localState.completed = 0;
   localState.error = 0;
   localState.errorString = "";
@@ -50 +52 @@
   localState.version = _ORXONOX_VERSION;
   
-  remoteState.completed = false;
+  remoteState.completed = 0;
   remoteState.error = 0;
   remoteState.errorString = "";
@@ -76 +78 @@
       {
         localState.error = 1;
-        localState.completed = true;
+        localState.completed = 1;
         localState.errorString = "Seems not to be orxonox!";
         return;
       }
       else
-        localState.completed = true;
+        if ( remoteState.version -= _ORXONOX_VERSION )
+          localState.completed = 1;
     }
      
@@ -89 +92 @@
       {
         localState.error = 2;
-        localState.completed = true;
+        localState.completed = 1;
         localState.errorString = "Versions of server and client do not match!";
         return;
       }
       else
-        localState.completed = true;
+        if ( remoteState.orxId == _ORXONOX_ID )
+          localState.completed = 1;
     }
     
   }
+  
+  for ( std::list<int>::iterator it = id.begin(); it != id.end(); it++ )
+  { 
+    if ( *it == netManId_handler )
+      NETPRINTF(0)("netManId_handler\n");
+    if ( *it == msgManId_handler )
+      NETPRINTF(0)("msgManId_handler\n");
+    if ( *it == hostId_handler )
+      NETPRINTF(0)("hostId_handler\n");
+    if ( *it == completed_handler )
+      NETPRINTF(0)("completed_handler\n");
+    if ( *it == error_handler )
+      NETPRINTF(0)("error_handler\n");
+    if ( *it == errorString_handler )
+      NETPRINTF(0)("errorString_handler\n");
+    if ( *it == orxId_handler )
+      NETPRINTF(0)("orxId_handler\n");
+    if ( *it == version_handler )
+      NETPRINTF(0)("version_handler\n");
+  }
 }
 

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

@@ -336 +336 @@
             this->networkGameManager->setUniqueID( it->second.handshake->getNetworkGameManagerId() );
             MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
-            
-            
+
           }
           else