Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9566 in orxonox.OLD for branches/proxy/src


Ignore:
Timestamp:
Jul 28, 2006, 2:41:07 PM (18 years ago)
Author:
patrick
Message:

major server message forwarding alg fix

File:
1 edited

Legend:

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

    r9563 r9566  
    249249
    250250      // find out if this message is addressed for this client too
    251       if( recieverType == RT_ALL_BUT_ME  && SharedNetworkData::getInstance()->getHostID() != destinationId ||
     251      if( recieverType == RT_ALL_BUT_ME  && SharedNetworkData::getInstance()->getHostID() != senderId ||
    252252          recieverType == RT_ALL_ME ||
    253253          recieverType == RT_NOT_USER && SharedNetworkData::getInstance()->getHostID() != destinationId ||
     
    277277        }
    278278      }
    279       // or else forward the message to the other servers
    280       else
     279
     280
     281      // check if the message needs to be forwarded
     282      if( recieverType == RT_ALL_BUT_ME ||
     283          recieverType == RT_ALL_ME ||
     284          recieverType == RT_NOT_USER ||
     285          recieverType == RT_USER  && SharedNetworkData::getInstance()->getHostID() != destinationId ||
     286          recieverType == RT_SERVER && SharedNetworkData::getInstance()->isProxyServerActive())
    281287      {
    282288        // forwarding the messages but only if its a proxy
     
    444450
    445451    if (
    446          recieverType == RT_ALL_ME ||
    447          recieverType == RT_ALL_BUT_ME ||
    448          recieverType == RT_USER && it->first == reciever ||
    449          recieverType == RT_NOT_USER && it->first != reciever ||
    450          recieverType == RT_SERVER && getNetworkStream()->isUserMasterServer( it->first ) ||
    451          recieverType == RT_SERVER && getNetworkStream()->isUserProxyServerActive( it->first )
     452         recieverType == RT_ALL_ME      ||
     453         recieverType == RT_ALL_BUT_ME  ||
     454         recieverType == RT_USER        && it->first == reciever ||
     455         recieverType == RT_NOT_USER    && it->first != reciever ||
     456         recieverType == RT_SERVER      && getNetworkStream()->isUserMasterServer( it->first ) ||
     457         recieverType == RT_SERVER      && getNetworkStream()->isUserProxyServerActive( it->first )
    452458       )
    453459    {
Note: See TracChangeset for help on using the changeset viewer.