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

Timestamp:

May 23, 2006, 11:40:29 AM (18 years ago)

Author:

rennerc

Message:

hover registers sync vars. started with connection monitor

File:

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

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

@@ -56 +56 @@
   /* initialize the references */
   this->type = NET_CLIENT;
-  this->networkProtocol = new NetworkProtocol();
-  this->connectionMonitor = new ConnectionMonitor();
 }
 
@@ -68 +66 @@
   this->peers[0].userId = 0;
   this->peers[0].isServer = true;
-  this->networkProtocol = new NetworkProtocol();
-  this->connectionMonitor = new ConnectionMonitor();
+  this->peers[0].connectionMonitor = new ConnectionMonitor( 0 );
 }
 
@@ -78 +75 @@
   this->init();
   this->serverSocket = new UdpServerSocket(port);
-  this->networkProtocol = new NetworkProtocol();
-  this->connectionMonitor = new ConnectionMonitor();
   this->bActive = true;
 }
@@ -126 +121 @@
   }
 
-  delete connectionMonitor;
-  delete networkProtocol;
 }
 
@@ -170 +163 @@
     this->synchronizeables.erase(disconnectSynchro);
   
-  //TODO set timestamp
-  oldSynchronizeables[sync.getUniqueID()] = 0;
+  oldSynchronizeables[sync.getUniqueID()] = SDL_GetTicks();
 }
 
@@ -202 +194 @@
   }
 
+  cleanUpOldSyncList();
   handleHandshakes();
   handleUpstream();
@@ -223 +216 @@
       peers[clientId].socket = tempNetworkSocket;
       peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID() );
+      peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
@@ -237 +231 @@
       peers[clientId].handshake = new Handshake(true, clientId, this->networkGameManager->getUniqueID(), MessageManager::getInstance()->getUniqueID());
       peers[clientId].handshake->setUniqueID(clientId);
+      peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].userId = clientId;
       peers[clientId].isServer = false;
@@ -259 +254 @@
   for ( PeerList::iterator it = peers.begin(); it != peers.end(); it++ )
   {
-    if ( it->second.socket && !it->second.socket->isOk() )
+    //TODO check for timeout
+    if (  
+          (it->second.socket && !it->second.socket->isOk() ) ||
+          it->second.connectionMonitor->hasTimedOut()
+       )
     {
       PRINTF(0)("Client is gone: %d\n", it->second.userId);
@@ -424 +423 @@
     
     assert( peer->second.socket->writePacket( buf, offset ) );
-    peer->second.sentStateTicks[currentState] = SDL_GetTicks();
+    
+    peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
+    
     NETPRINTF(n)("send packet: %d userId = %d\n", offset, peer->second.userId);
   }
@@ -509 +510 @@
           }
 
-        //TODO dont accept new object from all peers (probably only servers)
+          if ( !peers[peer->second.userId].isServer )
+          {
+            offset += syncDataLength;
+            continue;
+          }
+          
           int leafClassId;
           if ( INTSIZE > length - offset )
@@ -564 +570 @@
       }
       
-      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();
-      
-      NETPRINTF(n)("PING: user: %d ping: %d\n", peer->second.userId, peer->second.ping );
+      peer->second.connectionMonitor->processUnzippedIncomingPacket( buf, offset, currentState, ackedState );
     
       peer->second.lastAckedState = ackedState;
@@ -600 +585 @@
  * @todo create playable for new user
  */
-#include "world_entities/space_ships/space_ship.h"
 void NetworkStream::handleNewClient( int userId )
 {
@@ -608 +592 @@
 }
 
-
-
-
-
-
+/**
+ * removes old items from oldSynchronizeables
+ */
+void NetworkStream::cleanUpOldSyncList( )
+{
+  int now = SDL_GetTicks();
+  
+  for ( std::map<int,int>::iterator it = oldSynchronizeables.begin(); it != oldSynchronizeables.end();  )
+  {
+    if ( it->second < now - 10*1000 )
+    {
+      std::map<int,int>::iterator delIt = it;
+      it++;
+      oldSynchronizeables.erase( delIt );
+      continue;
+    }
+    it++;
+  }
+}
+
+
+
+
+
+