[Orxonox-commit 3044] r7740 - code/branches/presentation/src/libraries/network

smerkli at orxonox.net smerkli at orxonox.net
Wed Dec 8 16:39:04 CET 2010


Author: smerkli
Date: 2010-12-08 16:39:04 +0100 (Wed, 08 Dec 2010)
New Revision: 7740

Modified:
   code/branches/presentation/src/libraries/network/Server.cc
Log:
fixed server startup

Modified: code/branches/presentation/src/libraries/network/Server.cc
===================================================================
--- code/branches/presentation/src/libraries/network/Server.cc	2010-12-08 15:25:52 UTC (rev 7739)
+++ code/branches/presentation/src/libraries/network/Server.cc	2010-12-08 15:39:04 UTC (rev 7740)
@@ -109,7 +109,7 @@
     }
 
     /* connect and see if it worked */
-    if( msc.connect( MS_ADDRESS, 1234 ) )
+    if( msc.connect( MS_ADDRESS, ORX_MSERVER_PORT ) )
     { COUT(1) << "Error: could not connect to master server!\n";
       return;
     }
@@ -194,7 +194,8 @@
     LANDiscoverable::update();
 
     // receive and process requests from master server
-    helper_HandleMasterServerRequests();
+    /* todo */
+    //helper_HandleMasterServerRequests();
 
     if ( ClientInformation::hasClients() )
     {




More information about the Orxonox-commit mailing list