[Orxonox-commit 2992] r7688 - in code/branches/masterserver/src: libraries/network modules/masterserver

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-12-01 14:11:44 +0100 (Wed, 01 Dec 2010)
New Revision: 7688

Modified:
   code/branches/masterserver/src/libraries/network/MasterServerProtocol.h
   code/branches/masterserver/src/libraries/network/WANDiscovery.cc
   code/branches/masterserver/src/modules/masterserver/MasterServer.cc
Log:
further debugging.

Modified: code/branches/masterserver/src/libraries/network/MasterServerProtocol.h
===================================================================
--- code/branches/masterserver/src/libraries/network/MasterServerProtocol.h	2010-12-01 13:04:54 UTC (rev 7687)
+++ code/branches/masterserver/src/libraries/network/MasterServerProtocol.h	2010-12-01 13:11:44 UTC (rev 7688)
@@ -30,7 +30,7 @@
 #define MASTER_SERVER_PROTO
 
 /* master server address (to be moved elsewhere later) */
-#define MS_ADDRESS "129.132.3.227"
+#define MS_ADDRESS "172.16.113.1"
 
 #define MSPROTO_CLIENT "CL"
 #define MSPROTO_CLIENT_LEN 2 

Modified: code/branches/masterserver/src/libraries/network/WANDiscovery.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/WANDiscovery.cc	2010-12-01 13:04:54 UTC (rev 7687)
+++ code/branches/masterserver/src/libraries/network/WANDiscovery.cc	2010-12-01 13:11:44 UTC (rev 7688)
@@ -50,7 +50,8 @@
 
     /* connect and see if it worked */
     if( msc.connect( MS_ADDRESS, 1234 ) )
-      COUT(2) << "Error: could not connect to master server!\n";
+      COUT(2) << "Error: could not connect to master server at " 
+        << MS_ADDRESS << std::endl;
 
     COUT(4) << "Initialization of WANDiscovery complete.\n";
   }

Modified: code/branches/masterserver/src/modules/masterserver/MasterServer.cc
===================================================================
--- code/branches/masterserver/src/modules/masterserver/MasterServer.cc	2010-12-01 13:04:54 UTC (rev 7687)
+++ code/branches/masterserver/src/modules/masterserver/MasterServer.cc	2010-12-01 13:11:44 UTC (rev 7688)
@@ -34,7 +34,7 @@
 namespace orxonox 
 {
   /* singleton stuff */
-  //ManageScopedSingleton( MasterServer, ScopeID::Root, false );
+  ManageScopedSingleton( MasterServer, ScopeID::Root, false );
 
   /* helpers */
   static void