Changeset 9494 in orxonox.OLD for trunk/src/lib/network/proxy

Timestamp:

Jul 27, 2006, 10:44:28 AM (18 years ago)

Author:

bensch

Message:

merged the proxy back

Location:

trunk/src/lib/network/proxy

Files:

• network_settings.cc (modified) (4 diffs)
• network_settings.h (modified) (2 diffs)

trunk/src/lib/network/proxy/network_settings.cc

@@ -40 +40 @@
   // suggest a good standard max players value
   this->maxPlayer = 10;
-
-//   this->loadData();
 }
 
@@ -53 +51 @@
 
   // remove all unused proxy data again
-  for( int i = 0; i < this->proxies.size(); i++)
+  for(unsigned int i = 0; i < this->proxies.size(); i++)
   {
-    IPaddress* ip = this->proxies.back();
+    IP ip = this->proxies.back();
     this->proxies.pop_back();
-    delete ip;
   }
 }
@@ -104 +101 @@
 
   LoadParam(root, "max-player", this, NetworkSettings, setMaxPlayer);
+  LoadParam(root, "max-player-saturation", this, NetworkSettings, setMaxPlayerSaturation);
 
 
@@ -140 +138 @@
     return;
 
-  IPaddress *ip = new IPaddress;
-
-  SDLNet_ResolveHost( ip, proxyAddr.c_str(), 9999 );
-
-  this->proxies.push_back(ip);
+  this->proxies.push_back(IP(proxyAddr, 9999));
 }
 

trunk/src/lib/network/proxy/network_settings.h

@@ -37 +37 @@
     inline void setMaxPlayer(int number) { this->maxPlayer = number; }
     /** @returns teh max number of players */
-    int getMaxPlayer() { return this->maxPlayer; }
+    int getMaxPlayer() const { return this->maxPlayer; }
+    /** sets the @param saturation: a threshold in percente when the proxy servers should be activated to be able to redirect the clients */
+    inline void setMaxPlayerSaturation(float saturation) { this->maxPlayerSaturation = saturation; }
+
 
     void setMasterAddr(const std::string& masterAddr);
     /** @returns the address of the master server read from the network config file */
-    inline IP getMasterAddr() { return this->masterServer; }
+    inline const IP& getMasterAddr() const { return this->masterServer; }
 
     void setProxyAddr(const std::string& proxyAddr);
     /** @returns the list of proxy servers from the init file */
-    inline std::vector<IPaddress*>* getProxyList() { return &this->proxies; }
+    inline std::vector<IP>* getProxyList() { return &this->proxies; }
 
 
@@ -53 +56 @@
 
   private:
-    static NetworkSettings*        singletonRef;            //!< Pointer to the only instance of this Class
+    static NetworkSettings*      singletonRef;            //!< Pointer to the only instance of this Class
+
     int                          maxPlayer;               //!< maximal number of players
-    std::vector<IPaddress*>      proxies;                 //!< all registered proxies
+    float                        maxPlayerSaturation;     //!< the saturation level from where on the proxy server should be activated
+
+    std::vector<IP>              proxies;                 //!< all registered proxies
     IP                           masterServer;            //!< master server ip address