[Orxonox-commit 3042] r7738 - code/branches/masterserver/src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-12-08 16:13:02 +0100 (Wed, 08 Dec 2010)
New Revision: 7738

Modified:
   code/branches/masterserver/src/libraries/network/WANDiscovery.cc
   code/branches/masterserver/src/libraries/network/WANDiscovery.h
Log:
aaaand it works

Modified: code/branches/masterserver/src/libraries/network/WANDiscovery.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/WANDiscovery.cc	2010-12-08 15:08:22 UTC (rev 7737)
+++ code/branches/masterserver/src/libraries/network/WANDiscovery.cc	2010-12-08 15:13:02 UTC (rev 7738)
@@ -40,10 +40,6 @@
 {
   ManageScopedSingleton(WANDiscovery, ScopeID::Root, true);
 
-  void WANDiscovery::setConfigValues()
-  {
-    SetConfigValue(this->msaddr, "msaddr");
-  } 
 
   WANDiscovery::WANDiscovery()
   {
@@ -53,9 +49,6 @@
     /* register object with orxonox main class */
     RegisterObject(WANDiscovery);
 
-    /* set default string for this->msaddr */
-    this->msaddr = "localhost";
-
     /* ... and register a config value function for it */
     this->setConfigValues();
 
@@ -64,14 +57,19 @@
       COUT(2) << "Error: could not initialize master server communications!\n";
 
     /* connect and see if it worked */
-    if( msc.connect( this->msaddr.c_str(), 1234 ) )
+    if( msc.connect( this->msaddress.c_str(), 1234 ) )
       COUT(2) << "Error: could not connect to master server at " 
-        << this->msaddr << std::endl;
+        << this->msaddress << std::endl;
 
     /* debugging output */
     COUT(4) << "Initialization of WANDiscovery complete.\n";
   }
 
+  void WANDiscovery::setConfigValues()
+  {
+    SetConfigValue( msaddress, "localhost");
+  } 
+
   WANDiscovery::~WANDiscovery()
   { 
     /* clear server list */

Modified: code/branches/masterserver/src/libraries/network/WANDiscovery.h
===================================================================
--- code/branches/masterserver/src/libraries/network/WANDiscovery.h	2010-12-08 15:08:22 UTC (rev 7737)
+++ code/branches/masterserver/src/libraries/network/WANDiscovery.h	2010-12-08 15:13:02 UTC (rev 7738)
@@ -99,7 +99,7 @@
       MasterServerComm msc;
 
       /** master server address */
-      std::string msaddr;
+      std::string msaddress;
 
   }; // tolua_export