[Orxonox-commit 2933] r7633 - code/branches/masterserver/src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-11-10 16:01:07 +0100 (Wed, 10 Nov 2010)
New Revision: 7633

Modified:
   code/branches/masterserver/src/libraries/network/Server.cc
Log:
done for today.

Modified: code/branches/masterserver/src/libraries/network/Server.cc
===================================================================
--- code/branches/masterserver/src/libraries/network/Server.cc	2010-11-10 14:54:59 UTC (rev 7632)
+++ code/branches/masterserver/src/libraries/network/Server.cc	2010-11-10 15:01:07 UTC (rev 7633)
@@ -98,6 +98,13 @@
   {
   }
 
+
+  /* TODO */
+  void helper_ConnectToMasterserver()
+  {
+    /* TODO connect to master server here and say you're there */
+  }
+
   /**
   * This function opens the server by creating the listener thread
   */
@@ -106,9 +113,14 @@
     Host::setActive(true);
     COUT(4) << "opening server" << endl;
     this->openListener();
+    
+    /* make discoverable on LAN */
     LANDiscoverable::setActivity(true);
 
-    /* TODO connect to master server here and say you're there */
+    /* make discoverable on WAN */
+    helper_ConnectToMasterserver();
+
+    /* done */
     return;
   }
 
@@ -154,6 +166,8 @@
     // receive and process incoming discovery packets
     LANDiscoverable::update();
 
+    // TODO receive and process requests from master server
+
     if ( ClientInformation::hasClients() )
     {
       // process incoming gamestates