Changeset 7591 in orxonox.OLD for branches/network

Timestamp:

May 11, 2006, 8:05:17 AM (19 years ago)

Author:

rennerc

Message:

fixed some bugs

Location:

branches/network/src/lib/network

Files:

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

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

@@ -79 +79 @@
         return;
       }
+      else
+        localState.completed = true;
     }
      
@@ -90 +92 @@
         return;
       }
+      else
+        localState.completed = true;
     }
     

branches/network/src/lib/network/handshake.h

@@ -34 +34 @@
     inline bool       completed(){ return localState.completed != 0 && remoteState.completed != 0; }
     inline bool       ok(){ return localState.error == 0 && remoteState.error == 0; }
-    inline int        getHostId(){ return localState.hostId; }
-    inline int        getNetworkGameManagerId(){ return localState.networkManagerId; }
-    inline void       doReject( std::string reason ){ remoteState.error = 1; remoteState.errorString = "the server rejected your connection ["+ reason +"]"; }
+    inline int        getHostId(){ return remoteState.hostId; }
+    inline int        getNetworkGameManagerId(){ return remoteState.networkManagerId; }
+    inline void       doReject( std::string reason ){ localState.error = 1; localState.errorString = "the server rejected your connection ["+ reason +"]"; }
     
     virtual void varChangeHandler( std::list<int> & id );

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

@@ -142 +142 @@
   peers[0].handshake = hs;
 //   peers[0].handshake->setSynchronized( true );
-  this->connectSynchronizeable(*hs);
+  //this->connectSynchronizeable(*hs);
   //this->connectSynchronizeable(*hs);
   PRINTF(0)("NetworkStream: Handshake created: %s\n", hs->getName());
@@ -508 +508 @@
     {
       Synchronizeable & sync = **it;
-
+      
       if ( !sync.beSynchronized() || sync.getUniqueID() < 0 )
         continue;
@@ -515 +515 @@
       if ( peer->second.handshake && sync.getLeafClassID() != CL_HANDSHAKE )
         continue;
-
-      PRINTF(0)("syncing: id:%d name:%s\n", sync.getUniqueID(), sync.getClassName());
-      
+      
+      if ( isServer() && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+        continue;
+
       assert( offset + INTSIZE <= UDP_PACKET_SIZE );
       
@@ -644 +645 @@
         }
       }
-      
       offset += sync->setStateDiff( peer->second.userId, buf+offset, length-offset, state, fromState );
     }

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

@@ -126 +126 @@
   while ( it != sentStates[userId].end() && (*it)->stateId < fromStateId )
     it++;
-  ///FIXED: altered begin() -> end()
-  if ( it != sentStates[userId].end() )
+
+  if ( it != sentStates[userId].begin() )
   {
     for ( StateHistory::iterator it2 = sentStates[userId].begin(); it2 != it; it2++ )
@@ -209 +209 @@
 
   sentStates[userId].push_back( stateTo );
+  
+  assert( i == neededSize );
 
   //write diff to data
@@ -229 +231 @@
  * @param stateId id of current state
  * @param fromStateId id of the base state id
- * @return true on success
+ * @return number bytes read
  * @todo check for permissions
  */
-bool Synchronizeable::setStateDiff( int userId, byte* data, int length, int stateId, int fromStateId )
+int Synchronizeable::setStateDiff( int userId, byte* data, int length, int stateId, int fromStateId )
 {
   //make sure this user has his history
@@ -309 +311 @@
   this->varChangeHandler( changes );
   
-  return length;
+  return i;
 }
 

branches/network/src/lib/network/synchronizeable.h

@@ -63 +63 @@
 
     int getStateDiff( int userId, byte* data, int maxLength, int stateId, int fromStateId, int priorityTH );
-    bool setStateDiff( int userId, byte* data, int length, int stateId, int fromStateId );
+    int setStateDiff( int userId, byte* data, int length, int stateId, int fromStateId );
 
     void registerVar( SynchronizeableVar * var );