Various clean ups.

include/Engine/Network/HybridClient.h

@@ -1,13 +0,0 @@
-#ifndef HybridClient_h__
-#define HybridClient_h__
-
-class HybridClient
-{
-public:
-    HybridClient();
-    ~HybridClient();
-private:
-
-};
-
-#endif

include/Engine/Network/HybridServer.h

@@ -1,12 +0,0 @@
-#ifndef HybridServer_h__
-#define HybridServer_h__
-
-class HybridServer
-{
-public:
-    HybridServer();
-    ~HybridServer();
-private:
-};
-
-#endif

src/Engine/Network/Client.cpp

@@ -203,7 +203,6 @@ 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 });
 }

src/Engine/Network/HybridClient.cpp

@@ -1,10 +0,0 @@
-#include "Network/HybridClient.h"
-
-
-HybridClient::HybridClient()
-{
-}
-
-HybridClient::~HybridClient()
-{
-}

src/Engine/Network/HybridServer.cpp

@@ -1,9 +0,0 @@
-#include "Network/HybridServer.h"
-
-HybridServer::HybridServer()
-{ 
-}
-
-HybridServer::~HybridServer()
-{
-}

src/Engine/Network/Server.cpp

@@ -399,10 +399,7 @@ void Server::parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint)
     packet.WritePrimitive<int>(m_Reliable.Port());
     packet.WriteString("SERVERNAME");
     packet.WritePrimitive<int>(m_ConnectedPlayers.size());
-    //PlayerDefinition pDef;
+    m_ServerlistRequest.Send(packet);
-    //pDef.Endpoint = boost::asio::ip::udp::endpoint(endpoint.address(), 13);
-    LOG_INFO("Parsing a server list request!");
-    m_ServerlistRequest.Send(packet/*, endpoint*/);
 }
 
 void Server::disconnect(PlayerID playerID)

src/Engine/Network/TCPClient.cpp

@@ -64,26 +64,6 @@ void TCPClient::Receive(Packet& packet)
 
 size_t TCPClient::readBuffer()
 { 
-    //if (!m_Socket) {
-    //    return 0;
-    //}
-    //boost::system::error_code error;
-    //// Read size of packet
-    //size_t bytesReceived = m_Socket->read_some(boost
-    //    ::asio::buffer((void*)data, sizeof(int)),
-    //    error);
-    //int sizeOfPacket = 0;
-    //memcpy(&sizeOfPacket, data, sizeof(int));
-
-    //// Read the rest of the message
-    //bytesReceived += m_Socket->read_some(boost
-    //    ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-    //    error);
-    //if (error) {
-    //    //LOG_ERROR("receive: %s", error.message().c_str());
-    //}
-    //return bytesReceived;
-
     if (!m_Socket) {
         return 0;
     }

src/Engine/Network/TCPServer.cpp

@@ -91,38 +91,6 @@ std::string TCPServer::GetAddress()
     return endpoint.address().to_string().c_str();
 }
 
-//void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
-//{
-//    int bytesRead = readBuffer(m_ReadBuffer, playerDefinition);
-//    if (bytesRead > 0) {
-//        packet.ReconstructFromData(m_ReadBuffer, bytesRead);
-//    }
-//    lastReceivedSocket = playerDefinition.TCPSocket;
-//}
-//
-//int TCPServer::readBuffer(char* data, PlayerDefinition & playerDefinition)
-//{
-//    if (!playerDefinition.TCPSocket) {
-//        return 0;
-//    }
-//    boost::system::error_code error;
-//    // Read size of packet
-//    size_t bytesReceived = playerDefinition.TCPSocket->read_some(boost
-//        ::asio::buffer((void*)data, sizeof(int)),
-//        error);
-//    int sizeOfPacket = 0;
-//    memcpy(&sizeOfPacket, data, sizeof(int));
-//
-//    // Read the rest of the message
-//    bytesReceived += playerDefinition.TCPSocket->read_some(boost
-//        ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
-//        error);
-//    if (error) {
-//        //LOG_ERROR("receive: %s", error.message().c_str());
-//    }
-//    return bytesReceived;
-//}
-
 void TCPServer::Receive(Packet & packet, PlayerDefinition & playerDefinition)
 {
     int bytesRead = readBuffer(playerDefinition);

src/Engine/Network/UDPClient.cpp

@@ -35,18 +35,6 @@ void UDPClient::Receive(Packet& packet)
 
 int UDPClient::readBuffer()
 {
-    //if (!m_Socket) {
-    //    return 0;
-    //}
-    //boost::system::error_code error;
-    //int bytesReceived = m_Socket->receive_from(boost
-    //    ::asio::buffer((void*)data, BUFFERSIZE),
-    //    m_ReceiverEndpoint,
-    //    0, error);
-    //if (error) {
-    //    //LOG_ERROR("receive: %s", error.message().c_str());
-    //}
-    //return bytesReceived;
     if (!m_Socket) {
         return 0;
     }

src/Engine/Network/UDPServer.cpp

@@ -70,7 +70,6 @@ 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;
 }
 
@@ -81,15 +80,6 @@ bool UDPServer::IsSocketAvailable()
 
 int UDPServer::readBuffer()
 {
-    //boost::system::error_code error = boost::asio::error::host_not_found;
-    //unsigned int length = m_Socket->receive_from(
-    //    boost::asio::buffer((void*)data
-    //        , BUFFERSIZE)
-    //    , m_ReceiverEndpoint, 0, error);
-    //if (error) {
-    //    LOG_WARNING(error.message().c_str());
-    //}
-    //return length;
     if (!m_Socket) {
         return 0;
     }