Changeset 5747 in orxonox.OLD

Timestamp:

Nov 23, 2005, 11:32:20 PM (18 years ago)

Author:

patrick

Message:

network: some small changes in the NetworkStream and DataStream modules (see mail), printf output in the network_unit_test and short flag

Location:

branches/network/src

Files:

• lib/network/data_stream.h (modified) (3 diffs)
• lib/network/network_stream.cc (modified) (5 diffs)
• subprojects/network/network_unit_test.cc (modified) (2 diffs)

branches/network/src/lib/network/data_stream.h

@@ -13 +13 @@
 #include "netdefs.h"
 
+#define DATA_STREAM_BUFFER_SIZE 1024
+
 class DataStream : public BaseObject
 {
@@ -18 +20 @@
       DataStream();
       DataStream(DataStream& inStream, DataStream& outStream);
-      
       ~DataStream();
-           
+
 
       void connectUpStream(DataStream& upStream);
@@ -37 +38 @@
       int passUp(byte* data);
 
-      byte* upBuffer [1024];
-      byte* downBuffer [1024];
+      byte* upBuffer [DATA_STREAM_BUFFER_SIZE];
+      byte* downBuffer [DATA_STREAM_BUFFER_SIZE];
       unsigned int bufferSize;
       DataStream* upStream;

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

@@ -19 +19 @@
 */
 #define DEBUG_MODULE_NETWORK
-#define PACKAGE_SIZE  256
+
 
 #include "base_object.h"
@@ -35 +35 @@
 using namespace std;
 
+
+#define PACKAGE_SIZE  256
 
 
@@ -102 +104 @@
   
   /* send the received data to connectionMonitor */
-  this->connectionMonitor->processPacket((byte*)downBuffer, PACKAGE_SIZE);
+  this->connectionMonitor->processPacket((byte*)downBuffer, ret + sizeof(Header));
 
-        this->networkProtocol->createHeader((byte*) downBuffer , PACKAGE_SIZE , 1024,*(this->synchronizeables),12);
+  this->networkProtocol->createHeader((byte*)downBuffer, ret, DATA_STREAM_BUFFER_SIZE,
+                                       *(this->synchronizeables), 12);
         
   /* pass the data to the network socket */
@@ -119 +122 @@
   /* first of all read  data from networkSocket*/
   while(ret == 0)
-  ret = this->networkSocket->readBlock((byte*)upBuffer,PACKAGE_SIZE + sizeof(Header));
+  ret = this->networkSocket->readBlock((byte*)upBuffer, PACKAGE_SIZE + sizeof(Header));
   /* error checking: data read? */
-  if( ret != PACKAGE_SIZE) { PRINTF(0)("Error while reading data from the NetworkSocket\n");}
+  if( ret != PACKAGE_SIZE + sizeof(Header)) { PRINTF(0)("Error while reading data from the NetworkSocket\n");}
 
   /* send the received data to connectionMonitor */
@@ -130 +133 @@
     
   /* now pass the data to the sync object */
-  this->synchronizeables->writeBytes((byte*)upBuffer[sizeof(Header)], PACKAGE_SIZE);
+  this->synchronizeables->writeBytes((byte*)upBuffer, PACKAGE_SIZE);
 
 }

branches/network/src/subprojects/network/network_unit_test.cc

@@ -169 +169 @@
     //else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
     if (! strcmp( "--sockettest", argv[i]) || !strcmp("-s", argv[i])) return testSocket(argc, argv);
-    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-s", argv[i])) return testFramework(argc, argv);
+    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-f", argv[i])) return testFramework(argc, argv);
   }
 
@@ -180 +180 @@
 bool ShellBuffer::addBufferLineStatic(const char* line, ...)
 {
-  va_list arguments;
-  vprintf(line, arguments);
+  //va_list arguments;
+  //vprintf(line, arguments);
+  printf("%s", line);
 
 }