[Orxonox-commit 5787] r10447 - code/branches/multiplayerFS15/src/libraries/network
frovelli at orxonox.net
frovelli at orxonox.net
Thu May 21 14:39:05 CEST 2015
Author: frovelli
Date: 2015-05-21 14:39:05 +0200 (Thu, 21 May 2015)
New Revision: 10447
Modified:
code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc
code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc
code/branches/multiplayerFS15/src/libraries/network/MasterServerProtocol.h
code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc
code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h
Log:
cleanup
Modified: code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc 2015-05-21 11:19:28 UTC (rev 10446)
+++ code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc 2015-05-21 12:39:05 UTC (rev 10447)
@@ -59,7 +59,7 @@
/* update ownName string from orxonox.ini config file, if it
* has changed.
*/
- SetConfigValueExternal(ownName, "Discovery", "ownName", "tme213");
+ SetConfigValueExternal(ownName, "Discovery", "ownName", "OrxServer");
}
LANDiscoverable::~LANDiscoverable()
Modified: code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc 2015-05-21 11:19:28 UTC (rev 10446)
+++ code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc 2015-05-21 12:39:05 UTC (rev 10447)
@@ -44,9 +44,6 @@
/* forward declaration so the linker doesn't complain */
MasterServer *MasterServer::instance = NULL;
-
-
-
/* command: list servers */
void
MasterServer::listServers( void )
@@ -265,33 +262,32 @@
/* generate address in readable form */
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 */
helper_output_debug( event, addrconv );
/* 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 */
orxout(internal_info, context::master_server) << "Added new server to list: " <<
packet::ServerInformation( event ).getServerIP() << endl;
}
- 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 */
this->mainlist.delServerByAddress( ip );
@@ -301,12 +297,9 @@
}
/* 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);
@@ -317,12 +310,9 @@
orxout(internal_info, context::master_server) << "Updated server " << ip << " with new name " << name << endl;
}
- 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);
int clientNumber = Ogre::StringConverter::parseInt(textform);
@@ -333,20 +323,15 @@
orxout(internal_info, context::master_server) << "Updated server " << ip << " with new client number " << clientNumber << endl;
}
}
- 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 );
}
else
{ /* bad message, don't do anything. */ }
- /* delete addrconv */
- if( addrconv ) free( addrconv );
-
/* Clean up the packet now that we're done using it. */
enet_packet_destroy( event->packet );
return 0;
Modified: code/branches/multiplayerFS15/src/libraries/network/MasterServerProtocol.h
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/MasterServerProtocol.h 2015-05-21 11:19:28 UTC (rev 10446)
+++ code/branches/multiplayerFS15/src/libraries/network/MasterServerProtocol.h 2015-05-21 12:39:05 UTC (rev 10447)
@@ -43,8 +43,6 @@
#define MSPROTO_REQ_LIST_LEN 8
-
-
/*** GAME SERVER COMMUNICATIONS ***/
/* Game server token (shows that the party sending data is a game server) */
#define MSPROTO_GAME_SERVER "GS"
@@ -76,9 +74,11 @@
#define MSPROTO_ACK "ACK"
#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
Modified: code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc 2015-05-21 11:19:28 UTC (rev 10446)
+++ code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc 2015-05-21 12:39:05 UTC (rev 10447)
@@ -58,8 +58,7 @@
* has changed.
*/
SetConfigValueExternal(msaddress, "Discovery", "msaddress", "orxonox.net");
- SetConfigValueExternal(ownName, "Discovery", "ownName", "tme213");
-// SetConfigValue( msaddress, "orxonox.net");
+ SetConfigValueExternal(ownName, "Discovery", "ownName", "OrxServer");
}
WANDiscoverable::~WANDiscoverable()
@@ -125,9 +124,7 @@
{
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 );
}
Modified: code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h
===================================================================
--- code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h 2015-05-21 11:19:28 UTC (rev 10446)
+++ code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h 2015-05-21 12:39:05 UTC (rev 10447)
@@ -31,6 +31,7 @@
#include "NetworkPrereqs.h"
#include "core/config/Configurable.h"
#include "MasterServerComm.h"
+#include <OgreStringConverter.h>
namespace orxonox
{
More information about the Orxonox-commit
mailing list