Changeset 8068 in orxonox.OLD for trunk/src/lib/network/network_stream.cc

Timestamp:

Jun 1, 2006, 2:28:16 PM (18 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk

File:

• trunk/src/lib/network/network_stream.cc (modified) (9 diffs)

trunk/src/lib/network/network_stream.cc

@@ -177 +177 @@
 void NetworkStream::processData()
 {
+  int tick = SDL_GetTicks();
+  
   currentState++;
   
@@ -207 +209 @@
   // order of up/downstream is important!!!!
   // don't change it
-  handleDownstream();
-  handleUpstream();
+  handleDownstream( tick );
+  handleUpstream( tick );
 
 }
@@ -277 +279 @@
       PRINTF(0)("Client is gone: %d (%s)\n", it->second.userId, reason.c_str());
       
-      assert(false);
+      //assert(false);
 
       it->second.socket->disconnectServer();
@@ -391 +393 @@
  * handle upstream network traffic
  */
-void NetworkStream::handleUpstream( )
+void NetworkStream::handleUpstream( int tick )
 {
   int offset;
   int n;
   
-  for ( PeerList::iterator peer = peers.begin(); peer != peers.end(); peer++ )
+  for ( PeerList::reverse_iterator peer = peers.rbegin(); peer != peers.rend(); peer++ )
   {
     offset = INTSIZE; //make already space for length 
@@ -496 +498 @@
       writeToNewDict( buf, offset );
     
-    peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
-    peer->second.connectionMonitor->processZippedOutgoingPacket( compBuf, compLength, currentState );
+    peer->second.connectionMonitor->processUnzippedOutgoingPacket( tick, buf, offset, currentState );
+    peer->second.connectionMonitor->processZippedOutgoingPacket( tick, compBuf, compLength, currentState );
     
     //NETPRINTF(n)("send packet: %d userId = %d\n", offset, peer->second.userId);
@@ -506 +508 @@
  * handle downstream network traffic
  */
-void NetworkStream::handleDownstream( )
+void NetworkStream::handleDownstream( int tick )
 {
   int offset = 0;
@@ -527 +529 @@
     while ( 0 < (compLength = peer->second.socket->readPacket( compBuf, UDP_PACKET_SIZE )) )
     {
-      //TODO tell monitor about zipped packet. because dropped packets dont count to bandwidth
+      peer->second.connectionMonitor->processZippedIncomingPacket( tick, compBuf, compLength );
+      
       //PRINTF(0)("GGGGGOOOOOOOOOOTTTTTTTT: %d\n", compLength);
       packetLength = Zip::getInstance()->unZip( compBuf, compLength, buf, UDP_PACKET_SIZE );
@@ -547 +550 @@
       //NETPRINTF(n)("ackedstate: %d\n", ackedState);
       offset = 4*INTSIZE;
+      
+      peer->second.connectionMonitor->processUnzippedIncomingPacket( tick, buf, offset, state, ackedState );
 
       //NETPRINTF(n)("got packet: %d, %d\n", length, packetLength);
@@ -672 +677 @@
       }
       
-      peer->second.connectionMonitor->processZippedIncomingPacket( compBuf, compLength, state, ackedState );
-      peer->second.connectionMonitor->processUnzippedIncomingPacket( buf, offset, state, ackedState );
-    
       assert( peer->second.lastAckedState <= ackedState );
       peer->second.lastAckedState = ackedState;