Changeset 9433 in orxonox.OLD for branches/proxy
- Timestamp:
- Jul 24, 2006, 4:36:28 PM (18 years ago)
- Location:
- branches/proxy/src/lib/network
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/network_stream.cc
r9430 r9433 120 120 this->pInfo->lastRecvedState = 0; 121 121 122 this->bRedirect = false; 122 123 123 124 this->currentState = 0; … … 328 329 PRINTF(1)("lost connection to server\n"); 329 330 } 330 } 331 332 cleanUpOldSyncList(); 333 handleHandshakes(); 331 // check if there is a redirection command 332 if( this->bRedirect) 333 { 334 this->handleReconnect( 0); 335 } 336 } 337 338 this->cleanUpOldSyncList(); 339 this->handleHandshakes(); 334 340 335 341 // update the network monitor … … 338 344 // order of up/downstream is important!!!! 339 345 // don't change it 340 handleDownstream( tick );341 handleUpstream( tick );346 this->handleDownstream( tick ); 347 this->handleUpstream( tick ); 342 348 } 343 349 … … 519 525 if ( it->second.handshake->ok() ) 520 526 { 521 // the server gave it free for deletion527 // the counter part didn't mark it free for deletion yet 522 528 if ( !it->second.handshake->allowDel() ) 523 529 { … … 538 544 539 545 // now check if the server accepted the connection 546 if( it->second.handshake->redirect() ) 547 { 548 this->bRedirect = true; 549 } 540 550 541 551 // create the new network game manager and init it … … 627 637 PRINTF(0)("Client is redirected to the other proxy servers\n"); 628 638 PRINTF(0)(" user id: %i\n", userId); 629 PRINTF(0)(" connecting to: %s\n", pInfo->handshake->getProxy1Address().ipString().c_str());639 PRINTF(0)(" connecting to: %s\n", this->networkMonitor->getFirstChoiceProxy()->ip.ipString().c_str()); 630 640 PRINTF(0)("===============================================\n"); 631 641 … … 671 681 672 682 673 //for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ ) {674 //(*it2)->cleanUpUser( userId );675 //}683 for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ ) { 684 (*it2)->cleanUpUser( userId ); 685 } 676 686 // 677 687 // // NetworkGameManager::getInstance()->signalLeftPlayer(userId); -
branches/proxy/src/lib/network/network_stream.h
r9422 r9433 115 115 int dictServer; //!< the zip dict for the server 116 116 int dictClient; //!< the zip dict for the client 117 118 bool bRedirect; //!< true if the master server sent a redirect command 117 119 }; 118 120 #endif /* _NETWORK_STREAM */
Note: See TracChangeset
for help on using the changeset viewer.