Changeset 7650

Timestamp:

Nov 17, 2010, 4:05:13 PM (14 years ago)

Author:

smerkli

Message:

Minimum target achieved for today, servers can log on to master server, clients can get server list. To be debugged.

Location:

code/branches/masterserver/src/libraries/network

Files:

• MasterServerComm.cc (modified) (4 diffs)
• MasterServerComm.h (modified) (2 diffs)
• MasterServerProtocol.h (added)
• Server.cc (modified) (3 diffs)
• Server.h (modified) (2 diffs)
• WANDiscovery.cc (modified) (2 diffs)
• WANDiscovery.h (modified) (1 diff)

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

@@ -111 +111 @@
       /* address buffer */
       char *addrconv = NULL;
+      int retval = 0;
 
       /* check what type of event it is and react accordingly */
@@ -136 +137 @@
           /* call the supplied callback, if any. */
           if( (*callback) != NULL )
-            (*callback)( addrconv, &(this->event) );
+            retval = (*callback)( addrconv, &(this->event) );
 
           enet_packet_destroy( event.packet );
@@ -145 +146 @@
 
       /* event handled, return 0 */
-      return 0;
+      return retval;
     }
 
@@ -158 +159 @@
     ENetPacket * packet = enet_packet_create( data, 
         strlen( data ) + 1, 
+        ENET_PACKET_FLAG_RELIABLE);
+
+    /* Send the packet to the peer over channel id 0. */
+    enet_peer_send (this->peer, 0, packet);
+
+    /* One could just use enet_host_service() instead. */
+    enet_host_flush( this->client );
+    if( packet ) free( packet );
+
+    /* all done. */
+    return 0;
+  }
+
+  int MasterServerComm::sendRequest( std::string data )
+  {
+    /* send the data to the friend */
+    /* Create a reliable packet of size 7 containing "packet\0" */
+    ENetPacket * packet = enet_packet_create( data.c_str(), 
+        data.length() + 1, 
         ENET_PACKET_FLAG_RELIABLE);
 

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

@@ -29 +29 @@
 #include <cstdlib>
 #include <cstdio>
+#include <string>
 #include <cstring>
 #include <enet/enet.h>
@@ -65 +66 @@
       int sendRequest( char *data );
 
+      /** \param data The data to be sent. 
+       * \return 0 for success, other for error. 
+       * 
+       * Send a request to the master server containing data specified in data
+       * (string version)
+       */
+      int sendRequest( std::string data );
+
       /** \param callback The callback function to call with data receivced.
        * \return 0 for success, other for error

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

@@ -105 +105 @@
     /* initialize it and see if it worked */
     if( msc.initialize() )
-      COUT(1) << "Error: could not initialize master server communications!\n";
+    { COUT(1) << "Error: could not initialize master server communications!\n";
+      return;
+    }
 
     /* connect and see if it worked */
     if( msc.connect( MS_ADDRESS, 1234 ) )
-      COUT(1) << "Error: could not connect to master server!\n";
-
-    /* TODO */
+    { COUT(1) << "Error: could not connect to master server!\n";
+      return;
+    }
+
     /* now send the master server some note we're here */
+    msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_REGISTER_SERVER );
   }
 
@@ -164 +168 @@
 
   /* TODO */
-  int replyhandler( char *addr, ENetEvent *ev )
+  int rephandler( char *addr, ENetEvent *ev )
   { 
     /* handle incoming data */
@@ -174 +178 @@
   void Server::helper_HandleMasterServerRequests()
   { 
-    this->msc.pollForReply( replyhandler ); 
+    this->msc.pollForReply( rephandler ); 
   }
 

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

@@ -39 +39 @@
 #include "LANDiscoverable.h"
 #include "MasterServerComm.h"
+#include "MasterServerProtocol.h"
 
-/* proto (move to central point soon) */ 
-#define MS_ADDRESS "localhost"
 
 namespace orxonox
@@ -57 +56 @@
     ~Server();
 
+    /* helpers */
     void helper_ConnectToMasterserver();
+    void helper_HandleMasterServerRequests();
+    int replyhandler( char *addr, ENetEvent *ev );
+
     void open();
     void close();

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

@@ -63 +63 @@
   /* callback for the network reply poller */
   /* NOTE implement protocol-specific part here. */
-  int replyhandler( char *addr, ENetEvent *ev )
+  int rhandler( char *addr, ENetEvent *ev )
   { 
-    /* handle incoming data
-     * if a list entry arrives add to list
-     * if a done entry arrives set done to true
-     */
+    /* handle incoming data */
+    /* if a list entry arrives add to list */
+    if( !strncmp( ev->packet->data, MSPROTO_SERVERLIST_ITEM,
+      MSPROTO_SERVERLIST_ITEM_LEN ) )
+    { 
+      /* create server structure from that item */
+      ServerInformation toadd;
+
+      /* fill in data */
+      toadd->setName( std::string(ev->packet->data + 
+        MSPROTO_SERVERLIST_ITEM_LEN) );
+      toadd->setIP( std::string(ev->packet->data + 
+        MSPROTO_SERVERLIST_ITEM_LEN) );
+
+      /* add to list */
+      this->servers_.add( toadd );
+    }
+    else if( !strncmp( ev->packet->data, MSPROTO_SERVERLIST_END,
+      MSPROTO_SERVERLIST_END_LEN ) )
+    { return 1; }
 
     /* done handling, return all ok code 0 */
@@ -80 +96 @@
 
     /* send request to server */
-    msc.sendRequest( MSPROTO_CLIENT MSPROTO_REQ_LIST );
+    msc.sendRequest( MSPROTO_CLIENT " " MSPROTO_REQ_LIST );
 
     /* deal with replies */
-    while( msc.pollForReply( replyhandler ) ) 
+    while( !msc.pollForReply( rhandler ) ) 
       /* nothing */;
 

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

@@ -34 +34 @@
 #include "util/Singleton.h"
 #include "MasterServerComm.h"
+#include "MasterServerProtocol.h"
 
 #include <vector>
 
-/* master server address (to be moved elsewhere later) */
-#define MS_ADDRESS "localhost"
-
-/* protocol (to be moved elsewhere later) */
-#define MSPROTO_CLIENT "CL "
-#define MSPROTO_REQ_LIST "REQ:LIST"
 
 // tolua_begin