Changeset 6892 in orxonox.OLD for branches/network

Timestamp:

Jan 31, 2006, 2:28:45 PM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/network/src

Files:

• lib/coord/p_node.cc (modified) (3 diffs)
• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/network_stream.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (5 diffs)

branches/network/src/lib/coord/p_node.cc

@@ -1253 +1253 @@
   SYNCHELP_WRITE_BEGIN();
 
-  if ( this->getHostID()!=this->getOwner() )
+  if ( this->getHostID()!=0 && this->getHostID()!=this->getOwner() )
   {
     return SYNCHELP_WRITE_N;
@@ -1272 +1272 @@
 
   SYNCHELP_WRITE_BYTE( flags, NWT_PN_FLAGS );
-  //PRINTF(0)("FLAGS = %d\n", flags);
+  PRINTF(0)("FLAGS = %d\n", flags);
 
   if ( flags & __FLAG_COOR )
   {
 
-    //PRINTF(0)("SEND COOR: %f %f %f\n", this->relCoordinate.x, this->relCoordinate.y, this->relCoordinate.z);
+    PRINTF(0)("SEND COOR: %f %f %f\n", this->relCoordinate.x, this->relCoordinate.y, this->relCoordinate.z);
 
     SYNCHELP_WRITE_FLOAT( this->relCoordinate.x, NWT_PN_SCOORX );
@@ -1291 +1291 @@
   {
 
-    //PRINTF(0)("SEND QUAT: %f %f %f %f\n", this->absDirection.w, this->absDirection.v.x, this->absDirection.v.y, this->absDirection.v.z);
+    PRINTF(0)("SEND QUAT: %f %f %f %f\n", this->absDirection.w, this->absDirection.v.x, this->absDirection.v.y, this->absDirection.v.z);
 
     SYNCHELP_WRITE_FLOAT( this->absDirection.w, NWT_PN_SROTV );

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

@@ -895 +895 @@
   i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
+  PRINTF(0)("handleRequestSync %d %d\n", uniqueID, sender);
   doRequestSync( uniqueID, sender );
 
@@ -980 +981 @@
 void NetworkGameManager::executeRequestSync( int uniqueID, int user )
 {
+  PRINTF(0)("executeRequestSync %d %d\n", uniqueID, user);
   if ( user >= outBuffer.size() )
     resizeBufferVector( user );

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

@@ -231 +231 @@
   int reciever;
   Header header;
+  int counter;
+  
   for (SynchronizeableList::iterator it = synchronizeables.begin(); it!=synchronizeables.end(); it++)
   {
+    counter = 0;
+    
     if ( (*it)!=NULL && (*it)->beSynchronized() /*&& (*it)->getOwner() == myHostId*/ )
     {
       do {
+        counter++;
+        
+        //check for endless loop
+        if ( counter > 50 )
+        {
+          PRINTF(1)("there seems to be an error in readBytes of %s\n", (*it)->getClassName());
+          assert(false);
+        }
+        
         reciever = 0;
         dataLength = (*it)->readBytes(downBuffer, DATA_STREAM_BUFFER_SIZE, &reciever);
-
 
         if ( dataLength<=0 ){
@@ -267 +279 @@
             for ( int i = 0; i<networkSockets.size(); i++)
             {
-              if ( i!=-reciever && networkSockets[i] != NULL )
+              if ( i!=abs(reciever) && networkSockets[i] != NULL )
               {
-                PRINTF(5)("write %d bytes to socket %d\n", dataLength, i);
+                PRINTF(0)("write %d bytes to socket %d uniqueid %d reciever %d\n", dataLength, i, (*it)->getUniqueID(), reciever);
                 networkSockets[i]->writePacket(downBuffer, dataLength);
               }

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -651 +651 @@
   }
 
-  *reciever = -this->getOwner();
+  *reciever = 0 - this->getOwner();
+  //TODO: implement with SYNCHELP_WRITE_SENT()
   bool sentSomething = false;
 
-  if ( ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) && PNode::needsReadSync() )
-  {
+  if ( PNode::needsReadSync() && ( this->getHostID()==0 || this->getOwner() == this->getHostID() ) )
+  {
+    PRINTF(0)("sending PNode::readSync\n");
     SYNCHELP_WRITE_BYTE( DATA_sync, NWT_SS_B );
     SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
+    sentSomething = true;
   }
 
@@ -683 +686 @@
     {
       oldMask = mask;
+      PRINTF(0)("sending mask\n");
       sentSomething = true;
       SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
@@ -710 +714 @@
     {
       oldVelocity = velocity;
-      //PRINTF(0)("SENDING velocity\n");
+      PRINTF(0)("SENDING velocity\n");
       //SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
       //SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
@@ -720 +724 @@
     {
       sentSomething = true;
+      PRINTF(0)("SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC )\n");
       SYNCHELP_WRITE_BYTE( DATA_playables, NWT_SS_B );
       SYNCHELP_WRITE_FKT( Playable::readSync, NWT_SS_PL_SYNC );
@@ -727 +732 @@
   
   if ( !sentSomething )
-    reciever = 0;
+    *reciever = 0;
 
   return SYNCHELP_WRITE_N;