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

Timestamp:

May 19, 2006, 4:22:39 PM (18 years ago)

Author:

rennerc

Message:

fixed bug

File:

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

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

@@ -412 +412 @@
       offset += INTSIZE;
 
-      n = sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, 0 );
+      n = sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, -1000 );
       offset += n;
       
@@ -421 +421 @@
     
     assert( peer->second.socket->writePacket( buf, offset ) );
+    peer->second.sentStateTicks[currentState] = SDL_GetTicks();
     PRINTF(0)("send packet: %d userId = %d\n", offset, peer->second.userId);
   }
@@ -461 +462 @@
       assert( Converter::byteArrayToInt( buf + 2*INTSIZE, &fromState ) == INTSIZE );
       assert( Converter::byteArrayToInt( buf + 3*INTSIZE, &ackedState ) == INTSIZE );
+      PRINTF(0)("ackedstate: %d\n", ackedState);
       offset = 4*INTSIZE;
 
@@ -475 +477 @@
         continue;
       }
-
+      
       while ( offset < length )
       {
@@ -485 +487 @@
       
         Synchronizeable * sync = NULL;
-      
+        
         for ( SynchronizeableList::iterator it = synchronizeables.begin(); it != synchronizeables.end(); it++ )
         { 
@@ -495 +497 @@
           }
         }
-      
+        
         if ( sync == NULL )
         {
@@ -503 +505 @@
             continue;
           }
-        
+
         //TODO dont accept new object from all peers (probably only servers)
           int leafClassId;
@@ -511 +513 @@
             continue;
           }
-        
+
           Converter::byteArrayToInt( buf + offset, &leafClassId );
         
@@ -532 +534 @@
             continue;
           }
-        
+
           if ( b->isA(CL_SYNCHRONIZEABLE) )
           {
@@ -550 +552 @@
         }
 
-        offset += sync->setStateDiff( peer->second.userId, buf+offset, length-offset, state, fromState );
+        offset += sync->setStateDiff( peer->second.userId, buf+offset, syncDataLength, state, fromState ); 
       }
-    
+      
       if ( offset != length )
       {
+        PRINTF(0)("offset (%d) != length (%d)\n", offset, length);
         peer->second.socket->disconnectServer();
       }
+      
+      if ( peer->second.sentStateTicks.find( ackedState ) != peer->second.sentStateTicks.end() )
+      {
+        peer->second.ackDelay.push_back( SDL_GetTicks() - peer->second.sentStateTicks[ackedState] );
+      }
+      
+      while ( peer->second.sentStateTicks.begin()->first <= ackedState )
+        peer->second.sentStateTicks.erase( peer->second.sentStateTicks.begin() );
+      
+      while ( peer->second.ackDelay.size() > 20 )
+        peer->second.ackDelay.erase( peer->second.ackDelay.begin() );
+      
+      peer->second.ping = 0;
+      
+      for ( std::list<int>::iterator it = peer->second.ackDelay.begin(); it != peer->second.ackDelay.end(); it++ )
+        peer->second.ping += *it;
+      
+      if ( peer->second.ackDelay.size() == 0 )
+        peer->second.ping = -1;
+      else
+        peer->second.ping /= peer->second.ackDelay.size();
+      
+      PRINTF(0)("PING: user: %d ping: %d\n", peer->second.userId, peer->second.ping );
     
       peer->second.lastAckedState = ackedState;
+      peer->second.lastRecvedState = state;
+      
     }