Changeset 9292 in orxonox.OLD for branches/proxy/src/lib/network/monitor/network_monitor.h

Timestamp:

Jul 14, 2006, 1:17:08 PM (18 years ago)

Author:

patrick

Message:

seperating the proxy servers in passive and active

File:

• branches/proxy/src/lib/network/monitor/network_monitor.h (modified) (2 diffs)

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -41 +41 @@
     inline void addClient(NetworkNode* node, PeerInfo* pInfo) { node->addClient(pInfo); }
     /** adds to @param node a network node @param pInfo a new proxy server */
-    inline void addProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addProxyServer(pInfo); }
+    inline void addActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->addActiveProxyServer(pInfo); }
     /** adds to @param node a network node @param pInfo a new master server*/
     inline void addMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->addMasterServer(pInfo); }
 
     inline void removeClient(NetworkNode* node, PeerInfo* pInfo) { node->removeClient(pInfo); }
-    inline void removeProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removeProxyServer(pInfo); }
+    inline void removeActiveProxyServer(NetworkNode* node, PeerInfo* pInfo) { node->removeActiveProxyServer(pInfo); }
     inline void removeMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->removeMasterServer(pInfo); }
 
@@ -53 +53 @@
 
     /** @returns true if there are still free network slots available */
-    inline bool gotFreeSlots() { return (this->playerNumber < NET_MAX_CONNECTIONS)?true:false; }
+    inline bool gotFreeSlots() { return (this->localNode->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
+    /** @param node node to be checked for slots @returns true if there are still free network slots available at this node */
+    inline bool gorFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < NET_MAX_CONNECTIONS)?true:false; }
     void getServerWithFreeSlots() { }