Changeset 5808 in orxonox.OLD for branches/network/src/lib

Timestamp:

Nov 28, 2005, 9:07:21 PM (19 years ago)

Author:

patrick

Message:

network: valgrinded the network modules - zero error limit reached: small modification in NetworkSocket and ConnectionMonitor, nothing serious

Location:

branches/network/src/lib/network

Files:

• connection_monitor.cc (modified) (1 diff)
• data_stream.cc (modified) (4 diffs)
• data_stream.h (modified) (1 diff)
• network_socket.cc (modified) (3 diffs)
• network_socket.h (modified) (1 diff)

branches/network/src/lib/network/connection_monitor.cc

@@ -74 +74 @@
   /*Do whats needed for Averaging*/
 
-  if(packetCounter = packetToAverage)
+  if(packetCounter == packetToAverage)
     {
       computeCurrentDatarate();

branches/network/src/lib/network/data_stream.cc

@@ -31 +31 @@
 {
   this->setClassID(CL_DATA_STREAM, "DataStream");
+  this->upBuffer = new byte[DATA_STREAM_BUFFER_SIZE];
+  this->downBuffer = new byte[DATA_STREAM_BUFFER_SIZE];
 }
 
@@ -41 +43 @@
     this->downStream = &outStream;
     this->upStream = &inStream;
+
+    if( this->upBuffer)
+      delete[] this->upBuffer;
+    if( this->downBuffer)
+      delete[] this->downBuffer;
 }
 
@@ -101 +108 @@
 void passDown(byte* data, int length)
 {
-     
+
 }
 
@@ -115 +122 @@
 int passUp(byte* data)
 {
-    
+
 }

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

@@ -38 +38 @@
       int passUp(byte* data);
 
-      byte* upBuffer [DATA_STREAM_BUFFER_SIZE];
-      byte* downBuffer [DATA_STREAM_BUFFER_SIZE];
+      byte* upBuffer;
+      byte* downBuffer;
       unsigned int bufferSize;
       DataStream* upStream;

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

@@ -34 +34 @@
 NetworkSocket::NetworkSocket()
 {
+  this->init();
+}
+
+/**
+ * Constructor to connect directly
+ */
+NetworkSocket::NetworkSocket(IPaddress ip)
+{
+  this->init();
+  connectToServer(ip);
+}
+
+
+void NetworkSocket::init()
+{
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_SOCKET, "NetworkSocket");
@@ -58 +73 @@
   PRINTF(0)("NetworkSocket created\n");
 
-}
-
-/**
- * Constructor to connect directly
- */
-NetworkSocket::NetworkSocket(IPaddress ip)
-{
-  NetworkSocket();
-  connectToServer(ip);
 }
 
@@ -255 +261 @@
   int nbytes = (length<incomingBufferLength) ? length : incomingBufferLength;
 
+
   //printf("readBytes: nbytes = %d; length=%d; incomingBufferLength=%d\n", nbytes, length, incomingBufferLength);
 

branches/network/src/lib/network/network_socket.h

@@ -83 +83 @@
   int readBlock(byte * data, int length);
 
+private:
+  void init();
+
 };