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

Timestamp:

Jul 24, 2006, 2:49:33 PM (18 years ago)

Author:

bensch

Message:

cleaner ip inclusion

Location:

branches/proxy/src/lib/network/proxy

Files:

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

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

@@ -51 +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;
   }
 }
@@ -139 +138 @@
     return;
 
-  IPaddress *ip = new IPaddress;
+  IP ip(proxyAddr, 9999);
+  printf("========== ");
+  ip.debug();
 
-  SDLNet_ResolveHost( ip, proxyAddr.c_str(), 9999 );
-
-  this->proxies.push_back(ip);
+  this->proxies.push_back(ip);//IP(proxyAddr, 9999));
 }
 

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

@@ -48 +48 @@
     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; }
 
 
@@ -61 +61 @@
     float                        maxPlayerSaturation;     //!< the saturation level from where on the proxy server should be activated
 
-    std::vector<IPaddress*>      proxies;                 //!< all registered proxies
+    std::vector<IP>              proxies;                 //!< all registered proxies
     IP                           masterServer;            //!< master server ip address