Changeset 7776 in orxonox.OLD for branches

Timestamp:

May 23, 2006, 3:29:36 PM (19 years ago)

Author:

rennerc

Message:

removed some features

Location:

branches/network/src/lib/network

Files:

• connection_monitor.h (modified) (1 diff)
• handshake.cc (modified) (2 diffs)
• network_stream.cc (modified) (2 diffs)

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

@@ -28 +28 @@
     void calculatePing();
     
-    bool hasTimedOut(){ return ( lastPacketTick + SECS_TO_TIMEOUT*1000 < SDL_GetTicks() ) && nIncomingPackets > 0; }
+    //TODO
+    bool hasTimedOut(){ return false; return ( lastPacketTick + SECS_TO_TIMEOUT*1000 < SDL_GetTicks() ) && nIncomingPackets > 0; }
     
     int getMaxPacketSize();

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

@@ -103 +103 @@
   }
   
-  PRINTF(0)("=======================BEGIN=============================");
+  PRINTF(0)("=======================BEGIN=============================\n");
   for ( std::list<int>::iterator it = id.begin(); it != id.end(); it++ )
   { 
@@ -123 +123 @@
       PRINTF(0)("version_handler\n");
   }
-  PRINTF(0)("=========================================================");
+  PRINTF(0)("=========================================================\n");
 }
 

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

@@ -422 +422 @@
     }
     
+    NETPRINTF(n)("adsf\n");
+    
     assert( Converter::intToByteArray( offset, buf, INTSIZE ) == INTSIZE );
     
     assert( peer->second.socket->writePacket( buf, offset ) );
     
-    peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
+    //peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
     
     NETPRINTF(n)("send packet: %d userId = %d\n", offset, peer->second.userId);
@@ -573 +575 @@
       }
       
-      peer->second.connectionMonitor->processUnzippedIncomingPacket( buf, offset, currentState, ackedState );
+      //peer->second.connectionMonitor->processUnzippedIncomingPacket( buf, offset, currentState, ackedState );
     
       peer->second.lastAckedState = ackedState;