Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9303 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 17, 2006, 10:29:13 AM (18 years ago)
Author:
patrick
Message:

framework integration

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

Legend:

Unmodified
Added
Removed

  • branches/proxy/src/lib/network/handshake.cc

    r9300 r9303  
    130130        continue;
    131131      }
    132       else if( remoteState.nodeType == NET_PROXY_SERVER)
     132      else if( remoteState.nodeType == NET_PROXY_SERVER_ACTIVE)
    133133      {
    134134        continue;

  • branches/proxy/src/lib/network/monitor/network_monitor.cc

    r9301 r9303  
    6060    PeerInfo* peer = new PeerInfo();
    6161    peer->ip = *(*it);
    62     peer->nodeType = NET_PROXY_SERVER;
     62    peer->nodeType = NET_PROXY_SERVER_ACTIVE;
    6363    peer->userId = -1;
    6464

  • branches/proxy/src/lib/network/network_stream.cc

    r9300 r9303  
    266266    this->updateConnectionList();
    267267  }
    268   else if( this->pInfo->nodeType == NET_PROXY_SERVER)
     268  else if( this->pInfo->nodeType == NET_PROXY_SERVER_ACTIVE)
    269269  {
    270270    // execute everything the proxy server should do

  • branches/proxy/src/lib/network/network_stream.h

    r9290 r9303  
    4949    /* functions for the localhost settings */
    5050    inline bool isMasterServer() const { return (this->pInfo->nodeType == NET_MASTER_SERVER)? true:false; }
    51     inline bool isProxyServer() const { return (this->pInfo->nodeType == NET_PROXY_SERVER)? true:false; }
     51    inline bool isProxyServer() const { return (this->pInfo->nodeType == NET_PROXY_SERVER_ACTIVE)? true:false; }
    5252    inline bool isClient() const { return (this->pInfo->nodeType == NET_CLIENT)? true:false; }
    5353//     inline bool isActive() const { return this->bActive; }

  • branches/proxy/src/lib/network/peer_info.cc

    r9286 r9303  
    5858    case NET_CLIENT:
    5959      return std::string("client");
    60     case NET_PROXY_SERVER:
     60    case NET_PROXY_SERVER_ACTIVE:
    6161      return std::string("proxy server");
    6262    case NET_MASTER_SERVER:

  • branches/proxy/src/lib/network/peer_info.h

    r9290 r9303  
    2323
    2424    inline bool isMasterServer() { return this->nodeType == NET_MASTER_SERVER; }
    25     inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER; }
     25    inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
    2626    inline bool isClient() { return this->nodeType == NET_CLIENT; }
    2727

  • branches/proxy/src/lib/network/shared_network_data.h

    r9257 r9303  
    3131    inline bool isMasterServer() { return this->nodeType == NET_MASTER_SERVER; }
    3232    /** @returns true is this node is a proxy server */
    33     inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER; }
     33    inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
    3434    /** @returns true is this node is a client*/
    3535    inline bool isClient() { return this->nodeType == NET_CLIENT; }
Note: See TracChangeset for help on using the changeset viewer.