Changeset 7772 in orxonox.OLD for branches/network

Timestamp:

May 23, 2006, 2:58:52 PM (19 years ago)

Author:

rennerc

Message:

fixed bug

Location:

branches/network/src/lib/network

Files:

• connection_monitor.cc (modified) (5 diffs)
• connection_monitor.h (modified) (3 diffs)
• network_game_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (3 diffs)

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

@@ -33 +33 @@
   this->incomingUnzippedBandWidth = 0;
   this->outgoingUnzippedBandWidth = 0;
+  this->incomingZippedBandWidth = 0;
+  this->outgoingZippedBandWidth = 0;
   this->nIncomingPackets = 0;
   this->nOutgoingPackets = 0;
@@ -62 +64 @@
   
   for ( int i = 0; i < length; i++ )
+  {
     if ( data[i] == '\0' )
       nZeroBytes++;
+  }
   
   NETPRINTF(n)( "ZEROBYTES: %d (%f%%)\n", nZeroBytes, ((float)100)*nZeroBytes/length );
@@ -82 +86 @@
   }
       
-  while ( sentStateTicks.begin()->first <= ackedState )
-    sentStateTicks.erase( sentStateTicks.begin() );
+  //TODO cleanup list
+//  while ( sentStateTicks.begin()->first <= ackedState )
+//  {
+//    NETPRINTF(n)("removing old state\n");
+//    sentStateTicks.erase( sentStateTicks.begin() );
+//  }
+  
+  NETPRINTF(n)("adsf\n");
       
+  //TODO cleanup list
+#if 0
   while ( ackDelay.size() > N_PACKETS_FOR_PING )
+  {
+    NETPRINTF(n)("removing old ackdelay\n");
     ackDelay.erase( ackDelay.begin() );
+  }
+#endif
       
   ping = 0;
@@ -112 +128 @@
   // delete old packets
   while ( packetHistory.begin()->first < tick - MSECS_TO_CALC_BWIDTH )
+  {
     packetHistory.erase( packetHistory.begin() );
+  }
   
   float res = 0.0f;
@@ -131 +149 @@
 }
 
+/**
+ * calculates max packet size you can send now to fit into bandwidth
+ * @return 
+ */
+int ConnectionMonitor::getMaxPacketSize( )
+{
+}
 
+

branches/network/src/lib/network/connection_monitor.h

@@ -24 +24 @@
     void processUnzippedOutgoingPacket( byte * data, int length, int stateId );
     void processUnzippedIncomingPacket( byte * data, int length, int stateId, int ackedState );
-    void processZippedPacket(  );
+
     
     void calculatePing();
     
     bool hasTimedOut(){ return ( lastPacketTick + SECS_TO_TIMEOUT*1000 < SDL_GetTicks() ) && nIncomingPackets > 0; }
+    
+    int getMaxPacketSize();
     
   private:
@@ -40 +42 @@
     std::map<int,int>   outgoingUnzippedPacketHistory;
     
+    std::map<int,int>   incomingZippedPacketHistory;
+    std::map<int,int>   outgoingZippedPacketHistory;
+    
     std::list<int>      ackDelay;
     int                 ping;
@@ -45 +50 @@
     float               incomingUnzippedBandWidth;
     float               outgoingUnzippedBandWidth;
+    
+    float               incomingZippedBandWidth;
+    float               outgoingZippedBandWidth;
     
     int                 nIncomingPackets;

branches/network/src/lib/network/network_game_manager.cc

@@ -467 +467 @@
 {
   /* create new playable for Player*/
+
+  assert ( SharedNetworkData::getInstance()->isGameServer() );
+
   PRINTF(0)("Request for creation: %i\n", userId);
   int uniqueId = this->createEntity(CL_SPACE_SHIP, userId);

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

@@ -336 +336 @@
             this->networkGameManager->setUniqueID( it->second.handshake->getNetworkGameManagerId() );
             MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
+            
+            handleNewClient( it->second.userId );
           }
 
@@ -343 +345 @@
           it->second.handshake = NULL;
           
-          handleNewClient( it->second.userId );
         }
         else
@@ -597 +598 @@
 void NetworkStream::cleanUpOldSyncList( )
 {
+  //TODO dont return do something
+  return;
   int now = SDL_GetTicks();