[Orxonox-commit 2960] r7659 - code/branches/masterserver/src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-11-24 14:34:29 +0100 (Wed, 24 Nov 2010)
New Revision: 7659

Modified:
   code/branches/masterserver/src/libraries/network/MasterServerProtocol.h
   code/branches/masterserver/src/libraries/network/WANDiscovery.cc
Log:
wee

Modified: code/branches/masterserver/src/libraries/network/MasterServerProtocol.h
===================================================================
--- code/branches/masterserver/src/libraries/network/MasterServerProtocol.h	2010-11-24 13:18:36 UTC (rev 7658)
+++ code/branches/masterserver/src/libraries/network/MasterServerProtocol.h	2010-11-24 13:34:29 UTC (rev 7659)
@@ -30,7 +30,7 @@
 #define MASTER_SERVER_PROTO
 
 /* master server address (to be moved elsewhere later) */
-#define MS_ADDRESS "localhost"
+#define MS_ADDRESS "82.130.81.100"
 
 #define MSPROTO_CLIENT "CL"
 #define MSPROTO_CLIENT_LEN 2 
@@ -58,10 +58,8 @@
 
 
 #define ORX_MSERVER_PORT 1234
-#define MS_ADDRESS "localhost"
 
 
-
 #define ORX_MSERVER_MAXCONNS 32
 #define ORX_MSERVER_MAXCHANS 2
 

Modified: code/branches/masterserver/src/libraries/network/WANDiscovery.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/WANDiscovery.cc	2010-11-24 13:18:36 UTC (rev 7658)
+++ code/branches/masterserver/src/libraries/network/WANDiscovery.cc	2010-11-24 13:34:29 UTC (rev 7659)
@@ -43,7 +43,7 @@
   WANDiscovery::WANDiscovery()
   {
     /* create master server communications object */
-    this->msc = MasterServerComm();
+    //this->msc = MasterServerComm();
 
     /* initialize it and see if it worked */
     if( msc.initialize() )