Serverlist fix.

This commit is contained in:
stiffly
2016-02-23 10:33:20 +01:00
parent e5ff88d3c9
commit fe9dbf0b0f
4 changed files with 8 additions and 1 deletions
+2
View File
@@ -203,6 +203,8 @@ void Client::parseServerlist(Packet& packet)
std::string serverName = packet.ReadString();
int playersConnected = packet.ReadPrimitive<int>();
//TODO: This should not happen when a client is connected to a server
LOG_INFO("Parsing a server list!");
m_Serverlist.push_back({ address, port, serverName, playersConnected });
}
+1 -1
View File
@@ -401,7 +401,7 @@ void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
packet.WritePrimitive<int>(m_ConnectedPlayers.size());
//PlayerDefinition pDef;
//pDef.Endpoint = boost::asio::ip::udp::endpoint(endpoint.address(), 13);
LOG_INFO("Parsing a server list request!");
m_ServerlistRequest.Send(packet/*, endpoint*/);
}
+1
View File
@@ -91,6 +91,7 @@ void UDPClient::Send(Packet& packet)
void UDPClient::Broadcast(Packet& packet, int port)
{
packet.UpdateSize();
m_Socket->set_option(boost::asio::socket_base::broadcast(true));
m_Socket->send_to(boost::asio::buffer(
packet.Data(),
+4
View File
@@ -41,6 +41,7 @@ void UDPServer::Send(Packet & packet)
// Broadcasting respond specific logic
void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
{
packet.UpdateSize();
m_Socket->send_to(
boost::asio::buffer(
packet.Data(),
@@ -52,6 +53,7 @@ void UDPServer::Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint)
// Broadcasting
void UDPServer::Broadcast(Packet & packet, int port)
{
packet.UpdateSize();
m_Socket->set_option(boost::asio::socket_base::broadcast(true));
m_Socket->send_to(
boost::asio::buffer(
@@ -68,6 +70,7 @@ void UDPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
if (bytesRead > 0) {
packet.ReconstructFromData(m_ReadBuffer, bytesRead);
}
LOG_INFO("Received server list msg");
playerDefinition.Endpoint = m_ReceiverEndpoint;
}
@@ -90,6 +93,7 @@ int UDPServer::readBuffer()
if (!m_Socket) {
return 0;
}
int addasdasd = m_Socket->available();
boost::system::error_code error;
// Read size of packet
m_Socket->receive_from(boost