WIP Clients are working properly, servers are not.

src/Engine/Network/TCPClient.cpp

@@ -2,46 +2,55 @@
 
 using namespace boost::asio::ip;
 
-TCPClient::TCPClient(ConfigFile * config) : Client(config)
+TCPClient::TCPClient()
 {
-    m_Endpoint = tcp::endpoint(boost::asio::ip::address::from_string(address), port);
-    m_Socket = std::unique_ptr<tcp::socket>(new tcp::socket(m_IOService, m_Endpoint));
-    tcp::no_delay option(true);
-    m_Socket->set_option(option);
 }
 
 TCPClient::~TCPClient()
 {
-
 }
 
-void TCPClient::connect()
+void TCPClient::Connect(std::string playerName, std::string address, int port)
 {
+    if (m_Socket) {
+        return;
+    }
     if (!m_IsConnected) {
         boost::system::error_code error = boost::asio::error::host_not_found;
+        m_Endpoint = tcp::endpoint(boost::asio::ip::address::from_string(address), port);
+        m_Socket = std::unique_ptr<tcp::socket>(new tcp::socket(m_IOService, m_Endpoint));
+        tcp::no_delay option(true);
+        m_Socket->set_option(option);
         m_Socket->close();
         m_Socket->connect(m_Endpoint, error);
         LOG_INFO(error.message().c_str());
         if (!error) {
+            m_IsConnected = true;
             Packet packet(MessageType::Connect, m_SendPacketID);
-            packet.WriteString(m_PlayerName);
-            m_StartPingTime = std::clock();
-            send(packet);
+            packet.WriteString(playerName);
+            Send(packet);
         }
     }
 }
 
-void TCPClient::readFromServer()
+void TCPClient::Disconnect()
+{ 
+
+}
+
+void TCPClient::Receive(Packet& packet)
 {
-    while (m_Socket->available()) {
-        bytesRead = receive(readBuffer);
-        Packet packet(readBuffer, bytesRead);
-        parseMessageType(packet);
+    int bytesRead = readBuffer(m_ReadBuffer);
+    if (bytesRead > 0) {
+        packet.ReconstructFromData(m_ReadBuffer, bytesRead);
     }
 }
 
-int TCPClient::receive(char * data)
-{
+int TCPClient::readBuffer(char* data)
+{ 
+    if (!m_Socket) {
+        return 0;
+    }
     boost::system::error_code error;
     // Read size of packet
     int bytesReceived = m_Socket->read_some(boost
@@ -54,29 +63,26 @@ int TCPClient::receive(char * data)
     bytesReceived += m_Socket->read_some(boost
         ::asio::buffer((void*)(data + bytesReceived), sizeOfPacket - bytesReceived),
         error);
-    // Network Debug data
-    if (isReadingData) {
-        m_NetworkData.TotalDataReceived += bytesReceived;
-        m_NetworkData.DataReceivedThisInterval += bytesReceived;
-        m_NetworkData.AmountOfMessagesReceived++;
-    }
     if (error) {
         //LOG_ERROR("receive: %s", error.message().c_str());
     }
     return bytesReceived;
 }
 
-void TCPClient::send(Packet & packet)
+void TCPClient::Send(Packet & packet)
 {
     packet.UpdateSize();
     boost::system::error_code error;
     m_Socket->send(boost::asio::buffer(
         packet.Data(),
         packet.Size()), 0, error);
-    // Network Debug data
-    if (isReadingData) {
-        m_NetworkData.TotalDataSent += packet.Size();
-        m_NetworkData.DataSentThisInterval += packet.Size();
-        m_NetworkData.AmountOfMessagesSent++;
-    }
+    //Network::logSentData(packet.Size());
 }
+
+bool TCPClient::IsSocketAvailable()
+{
+    if (!m_Socket) {
+        return false;
+    }
+    return m_Socket->available();
+}