Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9636 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 31, 2006, 2:22:22 AM (18 years ago)
Author:
patrick
Message:

connection redirection now works also as it should

Location:
branches/proxy/src/lib/network
Files:
3 edited

Legend:

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

    r9568 r9636  
    453453         recieverType == RT_ALL_BUT_ME  ||
    454454         recieverType == RT_USER        && it->first == reciever ||
     455        recieverType == RT_USER        && reciever == NET_ID_MASTER_SERVER && !getNetworkStream()->isUserMasterServer( it->first ) ||  // special case: forward
    455456         recieverType == RT_NOT_USER    && it->first != reciever ||
    456457         recieverType == RT_SERVER      && getNetworkStream()->isUserMasterServer( it->first ) ||
  • branches/proxy/src/lib/network/network_manager.cc

    r9626 r9636  
    170170  this->networkStream->connectToMasterServer( name, port);
    171171
     172
    172173  // and start the handshake
    173174  this->networkStream->startHandshake();
  • branches/proxy/src/lib/network/synchronizeable.cc

    r9635 r9636  
    412412        hasPermission = true; b3 = true; }
    413413
     414
     415
    414416    // Permission   MASTER_SERVER accept if:
    415417    // sender == MASTER_SERVER
     
    426428               SharedNetworkData::getInstance()->isClient()*/) {
    427429      hasPermission = true; b6 = true; }
    428     // sender == SERVER && i am SERVER && user is not local
    429 //     else if(  (*it)->checkPermission( PERMISSION_SERVER ) &&
    430 //                 !SharedNetworkData::getInstance()->isUserClient( userId) &&
    431 //                 !SharedNetworkData::getInstance()->isClient() &&
    432 //                 !(SharedNetworkData::getInstance()->isUserLocal( this->owner) &&
    433 //                 this->owner !=  SharedNetworkData::getInstance()->getHostID())) {
    434 //       hasPermission = true; b7 = true; }
     430
    435431
    436432
     
    438434    else if(  (*it)->checkPermission( PERMISSION_ALL )) {
    439435      hasPermission = true; b8 = true; }
     436
    440437
    441438   // no rights to over-write local data
Note: See TracChangeset for help on using the changeset viewer.