Changeset 7809 in orxonox.OLD

Timestamp:

May 24, 2006, 3:27:07 PM (18 years ago)

Author:

rennerc

Message:

removed zerodiff handling

Location:

branches/network/src/lib/network

Files:

• network_stream.cc (modified) (5 diffs)
• synchronizeable.cc (modified) (1 diff)

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

@@ -390 +390 @@
     for ( SynchronizeableList::iterator it = synchronizeables.begin(); it != synchronizeables.end(); it++ )
     {
-      PRINTF(0)("offset: %d\n", offset);
       int oldOffset = offset;
       Synchronizeable & sync = **it;
@@ -427 +426 @@
       assert( Converter::intToByteArray( n, buf + offset - n - INTSIZE, INTSIZE ) == INTSIZE );
       
-      //check if all bytes == 0 -> remove data
-      bool allZero = true;
-      for ( int i = offset - n; i < offset; i++ )
-      {
-        if ( buf[i] != 0 )
-          allZero = false;
-      }
-      
-      if ( allZero )
-      {
-        NETPRINTF(n)("REMOVE ZERO DIFF: %s (%d)\n", sync.getClassName(), sync.getUniqueID());
-        offset = oldOffset;
-      }
-      
     }
     
@@ -449 +434 @@
     peer->second.connectionMonitor->processUnzippedOutgoingPacket( buf, offset, currentState );
     
-    assert( offset != 142 );
     NETPRINTF(n)("send packet: %d userId = %d\n", offset, peer->second.userId);
   }
@@ -507 +491 @@
       while ( offset + 2*INTSIZE < length )
       {
-        NETPRINTF(n)("%d\n", length - offset);
+        assert( offset > 0 );
         assert( Converter::byteArrayToInt( buf + offset, &uniqueId ) == INTSIZE );
         offset += INTSIZE;
@@ -513 +497 @@
         assert( Converter::byteArrayToInt( buf + offset, &syncDataLength ) == INTSIZE );
         offset += INTSIZE;
+        
+        assert( syncDataLength > 0 );
+        assert( syncDataLength < 1000 );
       
         Synchronizeable * sync = NULL;

branches/network/src/lib/network/synchronizeable.cc

@@ -262 +262 @@
   while ( it != recvStates[userId].end() && (*it)->stateId != fromStateId )
     it++;
+
   
 //  if ( getLeafClassID() == CL_SPACE_SHIP )