mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add game name to handshake and formalise handshake format

Browse source
This commit is contained in:
mdiluzio 2015-01-03 20:04:31 +00:00
parent 61c012370d
commit 1785ce2fc0
5 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
source/client/server.cpp
View file

@ -110,13 +110,14 @@ int runServer(int argc, char* argv[])
for( auto client : myClients )
{
// Handshake currently just player
std::string handshake = std::string("player ")+std::to_string((int)client.player);
char handshake[64];
snprintf(handshake, sizeof(handshake), TTRTS_HANDSHAKE_FORMAT,(unsigned int)client.player,game.GetName().c_str());
// Output the handshake
std::cout<<"Handshaking with "<<handshake<<std::endl;
std::cout<<"Handshaking:"<<handshake<<std::endl;
// Send handshake
if ( write( client.clientsockfd,handshake.c_str(),handshake.length() ) < 0 )
if ( write( client.clientsockfd,handshake,sizeof(handshake) ) < 0 )
error("ERROR sending to client");
// Recieve handshake
@ -124,8 +125,10 @@ int runServer(int argc, char* argv[])
if (read(client.clientsockfd,buffer,sizeof(buffer)-1) < 0)
error("ERROR reading from client");
std::cout<<"Received:"<<buffer<<std::endl;
// Verify handshake
if ( std::string(buffer) != handshake )
if ( std::string(buffer) != std::string(handshake) )
error("Error in client handshake");
std::cout<<"Success on handshake with "<<handshake<<std::endl;