Changeset 7792 in orxonox.OLD

Timestamp:

May 24, 2006, 11:38:51 AM (18 years ago)

Author:

rennerc

Message:

fixed bug

Location:

branches/network/src/lib/network

Files:

• connection_monitor.cc (modified) (1 diff)
• handshake.cc (modified) (4 diffs)
• network_stream.cc (modified) (7 diffs)

branches/network/src/lib/network/connection_monitor.cc

@@ -81 +81 @@
     ackDelay.push_back( tick - sentStateTicks[ackedState] );
   }
-      
-  while ( sentStateTicks.begin()->first <= ackedState )
+  
+  while ( sentStateTicks.begin() != sentStateTicks.end() && sentStateTicks.begin()->first <= ackedState )
     sentStateTicks.erase( sentStateTicks.begin() );
       

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

@@ -41 +41 @@
   errorString_handler = registerVarId( new SynchronizeableString( &localState.errorString, &remoteState.errorString, "errorString", PERMISSION_ALL ) );
   
-  localState.completed = false;
+  localState.completed = 0;
   localState.error = 0;
   localState.errorString = "";
@@ -50 +50 @@
   localState.version = _ORXONOX_VERSION;
   
-  remoteState.completed = false;
+  remoteState.completed = 0;
   remoteState.error = 0;
   remoteState.errorString = "";
@@ -76 +76 @@
       {
         localState.error = 1;
-        localState.completed = true;
+        localState.completed = 1;
         localState.errorString = "Seems not to be orxonox!";
-        return;
+        continue;
       }
-      else
-        localState.completed = true;
+
     }
      
@@ -89 +88 @@
       {
         localState.error = 2;
-        localState.completed = true;
+        localState.completed = 1;
         localState.errorString = "Versions of server and client do not match!";
-        return;
+        continue;
       }
-      else
-        localState.completed = true;
+
     }
     
   }
+  
+  if (
+      remoteState.orxId == _ORXONOX_ID &&
+      remoteState.version == _ORXONOX_VERSION
+     )
+    localState.completed = true;
 }
 

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

@@ -196 +196 @@
   cleanUpOldSyncList();
   handleHandshakes();
+  
+  handleDownstream();
   handleUpstream();
-  handleDownstream();
 
 }
@@ -250 +251 @@
   }
 
-
   //check if connections are ok else remove them
   for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
   {
-    //TODO check for timeout
     if (  
-          (it->second.socket && !it->second.socket->isOk() ) ||
-          it->second.connectionMonitor->hasTimedOut()
+          it->second.socket &&
+          ( 
+            !it->second.socket->isOk()  ||
+            it->second.connectionMonitor->hasTimedOut()
+          )
        )
     {
@@ -337 +339 @@
             MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
           }
+          else
+            handleNewClient( it->second.userId );
 
           PRINT(0)("handshake finished id=%d\n", it->second.handshake->getNetworkGameManagerId());
@@ -342 +346 @@
           delete it->second.handshake;
           it->second.handshake = NULL;
-          
-          handleNewClient( it->second.userId );
+
         }
         else
@@ -504 +507 @@
         if ( sync == NULL )
         {
+          PRINTF(0)("could not find sync with id %d. try to create it\n", uniqueId);
           if ( oldSynchronizeables.find( uniqueId ) != oldSynchronizeables.end() )
           {
@@ -524 +528 @@
 
           Converter::byteArrayToInt( buf + offset, &leafClassId );
+          
+          assert( leafClassId != 0 );
         
-          BaseObject * b;
+          BaseObject * b = NULL;
           /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
           /* Exception 1: NullParent */
-          if( leafClassId == CL_NULL_PARENT || leafClassId == CL_SYNCHRONIZEABLE )
+          if( leafClassId == CL_NULL_PARENT || leafClassId == CL_SYNCHRONIZEABLE || leafClassId == CL_NETWORK_GAME_MANAGER )
           {
             PRINTF(1)("Can not create Class with ID %x!\n", (int)leafClassId);
@@ -573 +579 @@
     
       peer->second.lastAckedState = ackedState;
+      
       peer->second.lastRecvedState = state;