Changeset 7614 in orxonox.OLD

Timestamp:

May 13, 2006, 6:11:22 PM (18 years ago)

Author:

rennerc

Message:

fixed some bugs - handshake works now

Location:

branches/network/src

Files:

• lib/network/network_stream.cc (modified) (9 diffs)
• lib/network/synchronizeable.cc (modified) (4 diffs)
• lib/network/synchronizeable_var/synchronizeable_quaternion.cc (modified) (2 diffs)
• lib/network/synchronizeable_var/synchronizeable_vector.cc (modified) (2 diffs)
• subprojects/network/simple_sync.cc (modified) (1 diff)

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

@@ -465 +465 @@
 
           PRINT(0)("handshake finished id=%d\n", it->second.handshake->getNetworkGameManagerId());
-          assert(false);
 
           delete it->second.handshake;
@@ -474 +473 @@
           PRINT(1)("handshake failed!\n");
           it->second.socket->disconnectServer();
-          assert(false);
         }
       }
@@ -521 +519 @@
       
       if ( isServer() && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+        continue;
+      
+      //do not sync null parent
+      if ( sync.getLeafClassID() == CL_NULL_PARENT )
         continue;
 
@@ -535 +537 @@
       //make space for size
       offset += INTSIZE;
-      
+
       n = sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, 0 );
       offset += n;
       
-      assert( Converter::intToByteArray( n, buf + offset - n, INTSIZE ) == INTSIZE );
+      assert( Converter::intToByteArray( n, buf + offset - n - INTSIZE, INTSIZE ) == INTSIZE );
     }
     
@@ -545 +547 @@
     
     assert( peer->second.socket->writePacket( buf, offset ) );
-    PRINTF(0)("send packet: %d userId = %d %x %d\n", offset, peer->second.userId, peer->second.handshake->getLeafClassID(), peer->second.handshake->getUniqueID());
-    assert( peer->second.handshake->getLeafClassID() == CL_HANDSHAKE );
+    PRINTF(0)("send packet: %d userId = %d\n", offset, peer->second.userId);
   }
 }
@@ -568 +569 @@
   for ( PeerList::iterator peer = peers.begin(); peer != peers.end(); peer++ )
   {
+    
     if ( !peer->second.socket )
       continue;
@@ -598 +600 @@
       continue;
     }
-    
+
     while ( offset < length )
     {
@@ -666 +668 @@
         }
       }
+
       offset += sync->setStateDiff( peer->second.userId, buf+offset, length-offset, state, fromState );
     }
@@ -676 +679 @@
     peer->second.lastAckedState = ackedState;
   }
-}
-
-
-
-
-
-
+  
+}
+
+
+
+
+
+

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

@@ -285 +285 @@
   else
     stateFrom = (*it);
-
+  
   std::list<int> changes;
   
@@ -302 +302 @@
   //add state to state history
   recvStates[userId].push_back( stateTo );
-
+  
   int i = 0;
 
@@ -309 +309 @@
     i += (*it)->readFromBuf( stateTo->data + i, stateTo->dataLength - i );
   }
-  
+
   this->varChangeHandler( changes );
   
@@ -322 +322 @@
 void Synchronizeable::varChangeHandler( std::list<int> & id )
 {
-  for ( std::list<int>::iterator it = id.begin(); it != id.end(); it++ )
-    assert( *it != mLeafClassId );
 }
 

branches/network/src/lib/network/synchronizeable_var/synchronizeable_quaternion.cc

@@ -83 +83 @@
   int n = 0;
 
-  res += Converter::byteArrayToFloat( buf + n, &x );
+  res = Converter::byteArrayToFloat( buf + n, &x );
   assert( res > 0 );
   n += res;
 
-  res += Converter::byteArrayToFloat( buf + n, &y );
+  res = Converter::byteArrayToFloat( buf + n, &y );
   assert( res > 0 );
   n += res;
 
-  res += Converter::byteArrayToFloat( buf + n, &z );
+  res = Converter::byteArrayToFloat( buf + n, &z );
   assert( res > 0 );
   n += res;
 
-  res += Converter::byteArrayToFloat( buf + n, &w );
+  res = Converter::byteArrayToFloat( buf + n, &w );
   assert( res > 0 );
   n += res;
@@ -101 +101 @@
   *vPtrOut = Quaternion( Vector(x, y, z), w );
 
-  assert( res == 4*FLOATSIZE );
-  return res;
+  assert( n == 4*FLOATSIZE );
+  return n;
 }
 

branches/network/src/lib/network/synchronizeable_var/synchronizeable_vector.cc

@@ -80 +80 @@
   int n = 0;
 
-  res += Converter::byteArrayToFloat( buf + n, &x );
+  res = Converter::byteArrayToFloat( buf + n, &x );
   assert( res > 0 );
   n += res;
 
-  res += Converter::byteArrayToFloat( buf + n, &y );
+  res = Converter::byteArrayToFloat( buf + n, &y );
   assert( res > 0 );
   n += res;
 
-  res += Converter::byteArrayToFloat( buf + n, &z );
+  res = Converter::byteArrayToFloat( buf + n, &z );
   assert( res > 0 );
   n += res;
@@ -94 +94 @@
   *vPtrOut = Vector( x, y, z );
 
-  assert( res == 3*FLOATSIZE );
-  return res;
+  assert( n == 3*FLOATSIZE );
+  return n;
 }
 

branches/network/src/subprojects/network/simple_sync.cc

@@ -31 +31 @@
   : Synchronizeable()
 {
+  setName( name );
   in = 0;
   out = 1;