Changeset 10447

Timestamp:

May 21, 2015, 2:39:05 PM (10 years ago)

Author:

frovelli

Message:

cleanup

Location:

code/branches/multiplayerFS15/src/libraries/network

Files:

• LANDiscoverable.cc (modified) (1 diff)
• MasterServer.cc (modified) (8 diffs)
• MasterServerProtocol.h (modified) (2 diffs)
• WANDiscoverable.cc (modified) (2 diffs)
• WANDiscoverable.h (modified) (1 diff)

code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc

@@ -60 +60 @@
      * has changed.
      */
-    SetConfigValueExternal(ownName, "Discovery", "ownName", "tme213");
+    SetConfigValueExternal(ownName, "Discovery", "ownName", "OrxServer");
   }
 

code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc

@@ -44 +44 @@
   /* forward declaration so the linker doesn't complain */
   MasterServer *MasterServer::instance = NULL;
-
-
-
 
   /* command: list servers */
@@ -266 +263 @@
     char *addrconv = (char *) calloc( 50, 1 );
     enet_address_get_host_ip( &(event->peer->address), addrconv, 49 );
+    /* convert to string */
+    std::string ip = std::string( addrconv );
+    /* delete addrconv */
+    if( addrconv ) free( addrconv );
+
+    /* pointer to full packet data */
+    char * packetdata = (char *)event->packet->data;
 
     /* output debug info about the data that has come */
@@ -271 +275 @@
 
     /* GAME SERVER OR CLIENT CONNECTION? */
-    if( !strncmp( (char *)event->packet->data, MSPROTO_GAME_SERVER,
-      MSPROTO_GAME_SERVER_LEN ) )
+    if( !strncmp(packetdata, MSPROTO_GAME_SERVER, MSPROTO_GAME_SERVER_LEN ) )
     { /* Game server */
 
-      if( !strncmp( (char *)event->packet->data
-        + MSPROTO_GAME_SERVER_LEN+1,
-        MSPROTO_REGISTER_SERVER, MSPROTO_REGISTER_SERVER_LEN ) )
+      if( !strncmp( packetdata + MSPROTO_GAME_SERVER_LEN+1, MSPROTO_REGISTER_SERVER, MSPROTO_REGISTER_SERVER_LEN ) )
       { /* register new server */
-        mainlist.addServer( packet::ServerInformation( event ),
-          event->peer );
+        mainlist.addServer( packet::ServerInformation( event ), event->peer );
 
         /* tell people we did so */
@@ -287 +287 @@
       }
 
-      else if( !strncmp( (char *)event->packet->data
-        + MSPROTO_GAME_SERVER_LEN+1,
-        MSPROTO_SERVERDC, MSPROTO_SERVERDC_LEN ) )
-      {
-        /* create string from peer data */
-        std::string ip = std::string( addrconv );
+      else if( !strncmp( packetdata + MSPROTO_GAME_SERVER_LEN+1, MSPROTO_SERVERDC, MSPROTO_SERVERDC_LEN ) )
+      { /* disconnect server */
 
         /* remove the server from the list it belongs to */
@@ -302 +298 @@
       /* TODO add hook for disconnect here */
 
-      else if( !strncmp( (char *)event->packet->data
-        + MSPROTO_GAME_SERVER_LEN+1,
-        MSPROTO_SET_NAME, MSPROTO_SET_NAME_LEN ) )
-      {
+      else if( !strncmp( packetdata + MSPROTO_GAME_SERVER_LEN+1, MSPROTO_SET_NAME, MSPROTO_SET_NAME_LEN ) )
+      { /* save server name */
         /* create string from peer data */
-        std::string ip = std::string( addrconv );
         std::string data (event->packet->data,event->packet->data + event->packet->dataLength );
         std::string name = data.substr(MSPROTO_GAME_SERVER_LEN+1 + MSPROTO_SET_NAME_LEN + 1);
@@ -318 +311 @@
       }
 
-      else if( !strncmp( (char *)event->packet->data
-        + MSPROTO_GAME_SERVER_LEN+1,
-        MSPROTO_SET_CLIENTS, MSPROTO_SET_CLIENTS_LEN ) )
-      {
+      else if( !strncmp( packetdata + MSPROTO_GAME_SERVER_LEN+1, MSPROTO_SET_CLIENTS, MSPROTO_SET_CLIENTS_LEN ) )
+      { /* save client count from server */
         /* create string from peer data */
-        std::string ip = std::string( addrconv );
         std::string data (event->packet->data,event->packet->data + event->packet->dataLength );
         std::string textform= data.substr(MSPROTO_GAME_SERVER_LEN + 1 + MSPROTO_SET_CLIENTS_LEN + 1);
@@ -334 +324 @@
       }
     }
-    else if( !strncmp( (char *)event->packet->data, MSPROTO_CLIENT,
-      MSPROTO_CLIENT_LEN) )
+    else if( !strncmp( packetdata, MSPROTO_CLIENT, MSPROTO_CLIENT_LEN) )
     { /* client */
-      if( !strncmp( (char *)event->packet->data + MSPROTO_CLIENT_LEN+1,
-        MSPROTO_REQ_LIST, MSPROTO_REQ_LIST_LEN ) )
+      if( !strncmp( packetdata + MSPROTO_CLIENT_LEN+1, MSPROTO_REQ_LIST, MSPROTO_REQ_LIST_LEN ) )
         /* send server list */
         helper_sendlist( event );
@@ -344 +332 @@
     else
     { /* bad message, don't do anything. */ }
-
-    /* delete addrconv */
-    if( addrconv ) free( addrconv );
 
     /* Clean up the packet now that we're done using it. */

code/branches/multiplayerFS15/src/libraries/network/MasterServerProtocol.h

@@ -44 +44 @@
 
 
-
-
 /*** GAME SERVER COMMUNICATIONS ***/
 /* Game server token (shows that the party sending data is a game server) */
@@ -77 +75 @@
 #define MSPROTO_ACK_LEN 3
 
+/* server name */
 #define MSPROTO_SET_NAME "NAM"
 #define MSPROTO_SET_NAME_LEN 3
 
+/* server number of clients */
 #define MSPROTO_SET_CLIENTS "CLI"
 #define MSPROTO_SET_CLIENTS_LEN 3

code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc

@@ -59 +59 @@
      */
     SetConfigValueExternal(msaddress, "Discovery", "msaddress", "orxonox.net");
-    SetConfigValueExternal(ownName, "Discovery", "ownName", "tme213");
-//     SetConfigValue( msaddress, "orxonox.net");
+    SetConfigValueExternal(ownName, "Discovery", "ownName", "OrxServer");
   }
 
@@ -126 +125 @@
     orxout(verbose, context::master_server) << "Sending new number of clients: " << clientNumber << endl;
     std::string request = MSPROTO_GAME_SERVER " " MSPROTO_SET_CLIENTS " ";
-    std::stringstream ss;
-    ss << clientNumber;
-    request +=  ss.str();
+    request += Ogre::StringConverter::toString(clientNumber);
 
     this->msc.sendRequest( request );

code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h

@@ -32 +32 @@
 #include "core/config/Configurable.h"
 #include "MasterServerComm.h"
+#include <OgreStringConverter.h>
 
 namespace orxonox