Changeset 9301 in orxonox.OLD

Timestamp:

Jul 17, 2006, 10:25:00 AM (18 years ago)

Author:

patrick

Message:

fixed a segfault.

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (1 diff)
• proxy/proxy_settings.h (modified) (1 diff)

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

@@ -53 +53 @@
 
   // assuming that the config files are already read we get the proxy servers
-  std::vector<IPaddress*>* proxyList = &ProxySettings::getInstance()->getProxyList();
+  std::vector<IPaddress*>* proxyList = ProxySettings::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/proxy/proxy_settings.h

@@ -34 +34 @@
 
     /** @returns the list of proxy servers from the init file */
-    inline std::vector<IPaddress*> getProxyList() { return this->proxies; }
+    inline std::vector<IPaddress*>* getProxyList() { return &this->proxies; }