Changeset 9396 in orxonox.OLD for branches/proxy/src/lib/network/monitor

Timestamp:

Jul 23, 2006, 10:07:23 PM (18 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

Location:

branches/proxy/src/lib/network/monitor

Files:

• network_monitor.cc (modified) (2 diffs)
• network_monitor.h (modified) (2 diffs)
• network_node.h (modified) (1 diff)

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

@@ -19 +19 @@
 #include "debug.h"
 
-#include "proxy/proxy_settings.h"
+#include "proxy/network_settings.h"
 #include "shared_network_data.h"
 
@@ -57 +57 @@
   {
     // assuming that the config files are already read we get the proxy servers
-    std::vector<IPaddress*>* proxyList = ProxySettings::getInstance()->getProxyList();
+    std::vector<IPaddress*>* proxyList = NetworkSettings::getInstance()->getProxyList();
     std::vector<IPaddress*>::iterator it = proxyList->begin();
     // create a peer info class and a network node class for each new proxy and add them to the passive list

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

@@ -55 +55 @@
     inline void removeMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->removeMasterServer(pInfo); }
 
+    PeerInfo* getFirstChoiceProxy();
+    PeerInfo* getSecondChoiceProxy();
+
+    /** @returns the active proxy server list of the localnode */
+    inline std::list<PeerInfo*> getActiveProxyServer() { return this->localNode->getActiveProxyServer(); }
+
     /* slots admin and info interface */
     /** @returns the total number of players in this game (including all proxy servers etc)*/
@@ -63 +69 @@
     /** @param node node to be checked for slots @returns true if there are still free network slots available at this node */
     inline bool gotFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
-    PeerInfo* getFirstChoiceProxy();
-    PeerInfo* getSecondChoiceProxy();
+
     /** @returns true if the next client should be reconnected to some other proxy server with more connections */
     inline bool isReconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }

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

@@ -37 +37 @@
     PeerInfo* getMasterServer(int index);
 
+    /** @returns the master server list */
+    inline std::list<PeerInfo*> getMasterServer() { return this->masterServerList; }
+    /** @returns the active proxy server list */
+    inline std::list<PeerInfo*> getActiveProxyServer() { return this->activeProxyServerList; }
+    /** @returns the passive proxy server list */
+    inline std::list<PeerInfo*> getPassiveProxyServer() { return this->passiveProxyServerList; }
+    /** @returns the client list */
+    inline std::list<PeerInfo*> getClient() { return this->clientList; }
+
+
     /** @returns the number of players */
     inline int getPlayerNumber() { return this->playerNumber; }