Changeset 6062 in orxonox.OLD for branches/network/src/lib
- Timestamp:
- Dec 12, 2005, 2:25:31 PM (19 years ago)
- Location:
- branches/network/src/lib/network
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/network/handshake.cc
r6053 r6062 38 38 void Handshake::writeBytes( const byte * data, int length ) 39 39 { 40 PRINTF( 0)("Handshake::writeBytes states = %d %d %d %d (%d)\n", hasState( HS_RECVD_INIT ), hasState( HS_RECVD_VER ), hasState( HS_RECVD_HID ), hasState( HS_COMPLETED ), state);40 PRINTF(5)("Handshake::writeBytes states = %d %d %d %d (%d)\n", hasState( HS_RECVD_INIT ), hasState( HS_RECVD_VER ), hasState( HS_RECVD_HID ), hasState( HS_COMPLETED ), state); 41 41 42 42 if ( hasState( HS_COMPLETED ) ) … … 86 86 } 87 87 88 if ( hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )88 if ( !isServer() && hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) ) 89 89 { 90 90 if ( length != 4 ) … … 107 107 int Handshake::readBytes( byte * data, int maxLength, int * reciever ) 108 108 { 109 PRINTF( 0)("Handshake::readBytes states = %d %d %d %d (%d)\n", hasState( HS_SENT_INIT ), hasState( HS_SENT_VER ), hasState( HS_SENT_HID ), hasState( HS_COMPLETED ), state);109 PRINTF(5)("Handshake::readBytes states = %d %d %d %d (%d)\n", hasState( HS_SENT_INIT ), hasState( HS_SENT_VER ), hasState( HS_SENT_HID ), hasState( HS_COMPLETED ), state); 110 110 111 111 if ( hasState( HS_COMPLETED ) ) -
branches/network/src/lib/network/network_socket.cc
r6041 r6062 159 159 int NetworkSocket::writeBytes(byte * data, int length) 160 160 { 161 PRINTF( 0)("NetworkSocket::writeBytes()\n");161 PRINTF(5)("NetworkSocket::writeBytes()\n"); 162 162 #ifdef _USE_OUTGOING_BUFFER 163 163 … … 207 207 int NetworkSocket::readBytes(byte * data, int length) 208 208 { 209 PRINTF( 0)("NetworkSocket::readBytes()\n");209 PRINTF(5)("NetworkSocket::readBytes()\n"); 210 210 if (data==NULL) 211 211 return 0; … … 311 311 { 312 312 SDL_mutexV(self->threadTerminationMutex); 313 delete self;314 313 } 315 314 else … … 380 379 { 381 380 SDL_mutexV(self->threadTerminationMutex); 382 delete self;383 381 } 384 382 else … … 394 392 bool NetworkSocket::writePacket( byte * data, int length ) 395 393 { 396 PRINTF( 0)("NetworkSocket::writePacket()\n");394 PRINTF(5)("NetworkSocket::writePacket()\n"); 397 395 if (length>255) 398 396 { … … 409 407 int NetworkSocket::readPacket( byte * data, int maxLength ) 410 408 { 411 PRINTF( 0)("NetworkSocket::readPacket()\n");409 PRINTF(5)("NetworkSocket::readPacket()\n"); 412 410 if (incomingBufferLength<1) 413 411 { -
branches/network/src/lib/network/network_stream.cc
r6060 r6062 122 122 { 123 123 this->synchronizeables.push_back(&sync); 124 sync.setNetworkStream( this ); 124 125 125 126 if( this->networkSockets.size()>0 ) … … 155 156 } 156 157 PRINT(0)("handshake finished\n"); 158 delete handshakes[i]; 159 handshakes[i] = NULL; 157 160 //TODO: replace handshake by entitymanager 158 161 } … … 176 179 { 177 180 //TODO: remove items from synchronizeables if they dont exist 178 if ( (*it)!=NULL && ClassList::exists(*it)&& (*it)->getOwner() == myHostId )181 if ( (*it)!=NULL && (*it)->getOwner() == myHostId ) 179 182 { 180 183 do { … … 197 200 if ( networkSockets[reciever] != NULL ) 198 201 { 199 PRINTF( 0)("write %d bytes to socket %d\n", dataLength, reciever);202 PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever); 200 203 networkSockets[reciever]->writePacket(downBuffer, dataLength); 201 204 } … … 211 214 if ( networkSockets[i] != NULL ) 212 215 { 213 PRINTF( 0)("write %d bytes to socket %d\n", dataLength, reciever);216 PRINTF(5)("write %d bytes to socket %d\n", dataLength, reciever); 214 217 networkSockets[i]->writePacket(downBuffer, dataLength); 215 218 } … … 366 369 networkSockets[i] = NULL; 367 370 //TODO: delete handshake from synchronizeable list so i can delete it 368 delete handshakes[i]; 371 if ( handshakes[i] ) 372 delete handshakes[i]; 369 373 handshakes[i] = NULL; 370 374
Note: See TracChangeset
for help on using the changeset viewer.