Context Navigation

Changeset 5808 in orxonox.OLD

Timestamp:

Nov 28, 2005, 9:07:21 PM (18 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

Files:

r5800	r5808
74	74	/Do whats needed for Averaging/
75	75
76		if(packetCounter = packetToAverage)
	76	if(packetCounter == packetToAverage)
77	77	{
78	78	computeCurrentDatarate();

r5728	r5808
31	31	{
32	32	this->setClassID(CL_DATA_STREAM, "DataStream");
	33	this->upBuffer = new byte[DATA_STREAM_BUFFER_SIZE];
	34	this->downBuffer = new byte[DATA_STREAM_BUFFER_SIZE];
33	35	}
34	36
…	…
41	43	this->downStream = &outStream;
42	44	this->upStream = &inStream;
	45
	46	if( this->upBuffer)
	47	delete[] this->upBuffer;
	48	if( this->downBuffer)
	49	delete[] this->downBuffer;
43	50	}
44	51
…	…
101	108	void passDown(byte* data, int length)
102	109	{
103
	110
104	111	}
105	112
…	…
115	122	int passUp(byte* data)
116	123	{
117
	124
118	125	}

-                      r5747
+                      r5808
       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;

-                      r5805
+                      r5808
 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");
 …
   PRINTF(0)("NetworkSocket created\n");
+}
-/**
- * Constructor to connect directly
- */
-NetworkSocket::NetworkSocket(IPaddress ip)
+{
-  NetworkSocket();
-  connectToServer(ip);
+}
 …
   int nbytes = (length<incomingBufferLength) ? length : incomingBufferLength;
   //printf("readBytes: nbytes = %d; length=%d; incomingBufferLength=%d\n", nbytes, length, incomingBufferLength);

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

-                      r5806
+                      r5808
   delete nm;
+  delete clientSync;
+  delete serverSync;
   return 0;
+}

r5806	r5808
31	31	: Synchronizeable(name)
32	32	{
	33	/* define the local buffer size */
33	34	this->outLength = 10;
34	35	this->recLength = 0;
…	…
37	38	this->inData = new byte[this->inLength];
38	39
	40	/* init the buffer data */
39	41	for( int i = 0; i < this->outLength; i++)
40	42	{
…	…
54	56	SimpleSync::~SimpleSync()
55	57	{
	58	if( this->outData)
	59	delete[] this->outData;
	60	if( this->inData)
	61	delete[] this->inData;
56	62	}
57	63

Note: See TracChangeset for help on using the changeset viewer.