Changeset 7634 for code/branches/masterserver/src/libraries/network

Timestamp:

Nov 10, 2010, 4:22:58 PM (14 years ago)

Author:

smerkli

Message:

 

Location:

code/branches/masterserver/src/libraries/network

Files:

• Server.cc (modified) (3 diffs)
• Server.h (modified) (3 diffs)

code/branches/masterserver/src/libraries/network/Server.cc

@@ -101 +101 @@
 
   /* TODO */
-  void helper_ConnectToMasterserver()
-  {
-    /* TODO connect to master server here and say you're there */
+  void Server::helper_ConnectToMasterserver()
+  {
+    /* initialize it and see if it worked */
+    if( msc.initialize() )
+      COUT(1) << "Error: could not initialize master server communications!\n";
+
+    /* connect and see if it worked */
+    if( msc.connect( MS_ADDRESS, 1234 ) )
+      COUT(1) << "Error: could not connect to master server!\n";
+
+    /* TODO */
+    /* now send the master server some note we're here */
   }
 
@@ -154 +163 @@
 
 
+  /* TODO */
+  int replyhandler( char *addr, ENetEvent *ev )
+  { 
+    /* handle incoming data */
+
+    /* done handling, return all ok code 0 */
+    return 0;
+  }
+
+  void Server::helper_HandleMasterServerRequests()
+  { 
+    this->msc.pollForReply( replyhandler ); 
+  }
+
   /**
   * Run this function once every tick
@@ -167 +190 @@
     LANDiscoverable::update();
 
-    // TODO receive and process requests from master server
+    // receive and process requests from master server
+    helper_HandleMasterServerRequests();
 
     if ( ClientInformation::hasClients() )

code/branches/masterserver/src/libraries/network/Server.h

@@ -38 +38 @@
 #include "ServerConnection.h"
 #include "LANDiscoverable.h"
+#include "MasterServerComm.h"
+
+/* proto (move to central point soon) */ 
+#define MS_ADDRESS "localhost"
 
 namespace orxonox
@@ -53 +57 @@
     ~Server();
 
+    void helper_ConnectToMasterserver();
     void open();
     void close();
@@ -82 +87 @@
 
     float timeSinceLastUpdate_;
+    MasterServerComm msc;
   };