Changeset 7602 in orxonox.OLD for branches/network/src/lib/network/network_stream.cc
- Timestamp:
- May 12, 2006, 9:08:48 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/network/network_stream.cc
r7591 r7602 163 163 if (disconnectSynchro != this->synchronizeables.end()) 164 164 this->synchronizeables.erase(disconnectSynchro); 165 166 this->bActive = false; 165 166 //TODO set timestamp 167 oldSynchronizeables[sync.getUniqueID()] = 0; 167 168 } 168 169 … … 462 463 463 464 PRINT(0)("handshake finished id=%d\n", it->second.handshake->getNetworkGameManagerId()); 464 465 assert(false); 465 466 466 467 delete it->second.handshake; … … 471 472 PRINT(1)("handshake failed!\n"); 472 473 it->second.socket->disconnectServer(); 474 assert(false); 473 475 } 474 476 } … … 529 531 offset += n; 530 532 531 offset += sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, 0 ); 533 //make space for size 534 offset += INTSIZE; 535 536 n = sync.getStateDiff( peer->second.userId, buf + offset, UDP_PACKET_SIZE-offset, currentState, peer->second.lastAckedState, 0 ); 537 offset += n; 538 539 assert( Converter::intToByteArray( n, buf + offset - n, INTSIZE ) == INTSIZE ); 532 540 } 533 541 … … 535 543 536 544 assert( peer->second.socket->writePacket( buf, offset ) ); 537 PRINTF(0)("send packet: %d\n", offset); 545 PRINTF(0)("send packet: %d userId = %d %x %d\n", offset, peer->second.userId, peer->second.handshake->getLeafClassID(), peer->second.handshake->getUniqueID()); 546 assert( peer->second.handshake->getLeafClassID() == CL_HANDSHAKE ); 538 547 } 539 548 } … … 553 562 int ackedState = 0; 554 563 int fromState = 0; 564 int syncDataLength = 0; 555 565 556 566 for ( PeerList::iterator peer = peers.begin(); peer != peers.end(); peer++ ) … … 592 602 offset += INTSIZE; 593 603 604 assert( Converter::byteArrayToInt( buf + offset, &syncDataLength ) == INTSIZE ); 605 offset += INTSIZE; 606 594 607 Synchronizeable * sync = NULL; 595 608 … … 606 619 if ( sync == NULL ) 607 620 { 621 if ( oldSynchronizeables.find( uniqueId ) != oldSynchronizeables.end() ) 622 { 623 offset += syncDataLength; 624 continue; 625 } 626 608 627 //TODO dont accept new object from all peers (probably only servers) 609 628 int leafClassId;
Note: See TracChangeset
for help on using the changeset viewer.