Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9468 in orxonox.OLD


Ignore:
Timestamp:
Jul 25, 2006, 8:45:18 PM (18 years ago)
Author:
patrick
Message:

assertion failure, becaus the proxy tried to accept the own connection

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/network_stream.cc

    r9465 r9468  
    326326  {
    327327    // execute everything the proxy server should do
    328     if ( clientSocket )
    329       clientSocket->update();
     328    if ( this->clientSocket )
     329      this->clientSocket->update();
    330330    if( this->proxySocket)
    331331      this->proxySocket->update();
     
    605605                }
    606606              }
    607               else if ( this->pInfo->isProxyServerActive() )
    608               {
    609                 it->second.nodeType = it->second.handshake->getRemoteNodeType();
    610                 it->second.ip = it->second.socket->getRemoteAddress();
    611 
    612                 this->networkMonitor->addNode(&it->second);
    613 
    614                 this->handleNewClient( it->second.userId );
    615 
    616                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
    617                 {
    618                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
    619                 }
    620               }
     607#warning no proxys cant accept clients anymore: uncomment the following lines. (uncommented becaus the proxy probably cant connect to another server as this
     608//               else if ( this->pInfo->isProxyServerActive() )
     609//               {
     610//                 it->second.nodeType = it->second.handshake->getRemoteNodeType();
     611//                 it->second.ip = it->second.socket->getRemoteAddress();
     612//
     613//                 this->networkMonitor->addNode(&it->second);
     614//
     615//                 this->handleNewClient( it->second.userId );
     616//
     617//                 if ( PlayerStats::getStats( it->second.userId ) && it->second.handshake->getPreferedNickName() != "" )
     618//                 {
     619//                   PlayerStats::getStats( it->second.userId )->setNickName( it->second.handshake->getPreferedNickName() );
     620//                 }
     621//               }
    621622
    622623              PRINT(0)("handshake finished delete it\n");
Note: See TracChangeset for help on using the changeset viewer.