Changeset 6256 in orxonox.OLD

Timestamp:

Dec 21, 2005, 7:26:49 PM (18 years ago)

Author:

rennerc

Message:

network_socket: can now send more than 255 bytes
network_game_manager: fixed some bugs

Location:

branches/network/src/lib/network

Files:

• network_game_manager.cc (modified) (20 diffs)
• network_socket.cc (modified) (4 diffs)
• network_stream.cc (modified) (1 diff)

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

@@ -73 +73 @@
   byte b;
 
-  while ( i<length )
+  while ( i<length-1 )
   {
     b = data[i++];
+
+    PRINTF(0)("WriteBytes: b = %d\n", b);
 
     if ( isServer() )
@@ -92 +94 @@
       }
     }
-
-    if ( !isServer() )
+    else
     {
       if ( b == CREATE_ENTITY )
@@ -362 +363 @@
     return;
 
+  PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount());
+
   while ( it != e )
   {
     if ( !writeToClientBuffer( outBuffer[userID], (*it)->getClassID() ) )
       return;
+
+    PRINTF(0)("SendEntityList: ClassID = %x\n", (*it)->getClassID());
 
     if ( !writeToClientBuffer( outBuffer[userID], (*it)->getUniqueID() ) )
@@ -409 +414 @@
   if ( !b )
   {
-    PRINTF(1)("Could not fabricate Object with classID %d\n", classID);
-    return;
+    PRINTF(1)("Could not fabricate Object with classID %x\n", classID);
+    return;
+  }
+  else
+  {
+    PRINTF(0)("Fabricated entity: %s\n", b->getClassName());
   }
 
@@ -422 +431 @@
   else
   {
-    PRINTF(1)("Class with ID %d is not a synchronizeable!", (int)classID);
+    PRINTF(1)("Class with ID %x is not a synchronizeable!", (int)classID);
     delete b;
   }
@@ -549 +558 @@
   }
   int classID;
-  i += Converter::byteArrayToInt( data, &classID );
+  i += Converter::byteArrayToInt( &data[i], &classID );
 
   createEntity( (ClassID)classID );
@@ -564 +573 @@
   }
   int uniqueID;
-  i += Converter::byteArrayToInt( data, &uniqueID );
+  i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
   removeEntity( uniqueID );
@@ -579 +588 @@
   }
   int classID;
-  i += Converter::byteArrayToInt( data, &classID );
+  i += Converter::byteArrayToInt( &data[i], &classID );
 
   if ( INTSIZE > length-i )
@@ -587 +596 @@
   }
   int uniqueID;
-  i += Converter::byteArrayToInt( data, &uniqueID );
+  i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
   if ( INTSIZE > length-i )
@@ -595 +604 @@
   }
   int owner;
-  i += Converter::byteArrayToInt( data, &owner );
+  i += Converter::byteArrayToInt( &data[i], &owner );
 
   doCreateEntity( (ClassID)classID, uniqueID, owner );
@@ -610 +619 @@
   }
   int uniqueID;
-  i += Converter::byteArrayToInt( data, &uniqueID );
+  i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
   doRemoveEntity( uniqueID );
@@ -624 +633 @@
     return false;
   }
+
+  PRINTF(0)("HandleCreateEntityList:  data[i..i+3] = %d %d %d %d\n", data[i], data[i+1], data[i+2], data[i+3]);
+
   int n;
-  i += Converter::byteArrayToInt( data, &n );
+  i += Converter::byteArrayToInt( &data[i], &n );
+
+
+  PRINTF(0)("HandleCreateEntityList: n = %d\n", n);
 
   int classID, uniqueID, owner;
@@ -637 +652 @@
       return false;
     }
-    i += Converter::byteArrayToInt( data, &classID );
+    i += Converter::byteArrayToInt( &data[i], &classID );
 
     if ( INTSIZE > length-i )
@@ -644 +659 @@
       return false;
     }
-    i += Converter::byteArrayToInt( data, &uniqueID );
+    i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
     if ( INTSIZE > length-i )
@@ -651 +666 @@
       return false;
     }
-    i += Converter::byteArrayToInt( data, &owner );
+    i += Converter::byteArrayToInt( &data[i], &owner );
 
     doCreateEntity( (ClassID)classID, uniqueID, owner );
@@ -667 +682 @@
   }
   int n;
-  i += Converter::byteArrayToInt( data, &n );
+  i += Converter::byteArrayToInt( &data[i], &n );
 
   int uniqueID;
@@ -679 +694 @@
       return false;
     }
-    i += Converter::byteArrayToInt( data, &uniqueID );
+    i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
     doRemoveEntity( uniqueID );
@@ -696 +711 @@
 
   int uniqueID;
-  i += Converter::byteArrayToInt( data, &uniqueID );
+  i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
   doYouAre( uniqueID );
@@ -711 +726 @@
   }
   int uniqueID;
-  i += Converter::byteArrayToInt( data, &uniqueID );
+  i += Converter::byteArrayToInt( &data[i], &uniqueID );
 
   doRequestSync( uniqueID, sender );
@@ -733 +748 @@
 bool NetworkGameManager::writeToClientBuffer( clientBuffer & cb, int i )
 {
-  int n = Converter::intToByteArray( i, cb.buffer, cb.maxLength-cb.length );
+  int n = Converter::intToByteArray( i, cb.buffer+cb.length, cb.maxLength-cb.length );
   cb.length += n;
 

branches/network/src/lib/network/network_socket.cc

@@ -21 +21 @@
 #define DEBUG_MODULE_NETWORK
 
+#include "converter.h"
 
 /* include your own header */
@@ -398 +399 @@
 {
   PRINTF(5)("NetworkSocket::writePacket()\n");
-  if (length>255)
-  {
-    PRINTF(1)("Packet length > 255!\n");
-    return false;
-  }
-
-  byte blen = length;
-
-  writeBytes(&blen, 1);
+
+  byte blen[INTSIZE];
+
+  Converter::intToByteArray( length, blen, INTSIZE );
+
+  writeBytes(blen, INTSIZE);
   writeBytes(data, length);
 }
@@ -413 +411 @@
 {
   PRINTF(5)("NetworkSocket::readPacket()\n");
-  if (incomingBufferLength<1)
-  {
-    return 0;
-  }
-
-  byte blen = incomingBuffer[0];
+  if (incomingBufferLength<INTSIZE)
+  {
+    return 0;
+  }
+
+  int blen;
+  Converter::byteArrayToInt( incomingBuffer, &blen );
 
   if (blen>maxLength)
@@ -431 +430 @@
   }
 
-  readBytes(&blen, 1);
+  byte t[INTSIZE];
+  readBytes(t, INTSIZE);
   int res = readBytes(data, blen);
 

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

@@ -262 +262 @@
       } while( reciever!=0 );
     }
-    else
-    {
-      PRINTF(0)("synchronizeables == NULL");
-    }
   }