Reactored the package loss logic.

Server cannot handle multiple clients yet.
Fixed WorldTest code by adding astrix.

include/Engine/Network/Client.h

@@ -51,8 +51,9 @@ private:
 	boost::asio::ip::udp::socket m_Socket;
 
 	// Packet loss logic
-	unsigned int m_PacketID = 0;
+    unsigned int m_PacketID = 0;
 	unsigned int m_PreviousPacketID = 0;
+    unsigned int m_SendPacketID = 0;
 
 	World* m_World;
 	int m_PlayerID = -1;

include/Engine/Network/NetworkDefinitions.h

@@ -9,7 +9,6 @@
 #define BOARDSIZE 16
 #define MAXCONNECTIONS 8
 #define INPUTSIZE 128
-#define PACKETMODULUS 1000 // How many packets to send before the number resets
 #define PLAYERSPEED 0.2f;
 
 typedef boost::shared_ptr<boost::asio::ip::udp::socket> socket_ptr;

include/Engine/Network/Package.h

@@ -8,25 +8,25 @@
 class Package
 {
 public:
-	// arg1: Type of message (Connect, Disconnect...)
+    // arg1: Type of message (Connect, Disconnect...)
-	// arg2: PackageID for identifying packet loss.
+    // arg2: PackageID for identifying packet loss.
-	Package(MessageType type);
+    Package(MessageType type, unsigned int& packageID);
-	~Package();
+    ~Package();
-	// Add primitive types like int, float, char...
+    // Add primitive types like int, float, char...
-	template<typename T>
+    template<typename T>
-	void AddPrimitive(T val)
+    void AddPrimitive(T val)
-	{
+    {
-		memcpy(m_Data + m_Offset, &val, sizeof(T));
+        memcpy(m_Data + m_Offset, &val, sizeof(T));
-		m_Offset += sizeof(T);
+        m_Offset += sizeof(T);
-	}
+    }
-	void AddString(std::string str);
+    void AddString(std::string str);
 
-	int Size() { return m_Offset; };
+    int Size() { return m_Offset; };
-	char* Data() { return m_Data; };
+    char* Data() { return m_Data; };
 
 private:
-	char* m_Data = new char[128];
+    char* m_Data = new char[128];
-	int m_Offset = 0;
+    int m_Offset = 0;
 };
 
 #endif

include/Engine/Network/Server.h

@@ -32,11 +32,10 @@ private:
     std::clock_t m_StopTimes[8];
     // Game logic
     World* m_World;
-	// Packet loss logic
+    // Packet loss logic
-	unsigned int m_PacketCounter = 0;
+    unsigned int m_PacketID;
-	unsigned int m_PacketID = 0;
+    unsigned int m_PreviousPacketID;
-	const unsigned int m_PacketModolus = 1000;
+    unsigned int m_SendPacketID;
-
     // Close logic
     bool m_ThreadIsRunning = true;
     // Threaded
@@ -45,18 +44,15 @@ private:
     void InputLoop();
 
 
-
     int  Receive(char* data, size_t length);
-	void Send(Package& package, int playerID);
+    void Send(Package& package, int playerID);
-	void Send(Package& package);
+    void Send(Package& package);
-    int  CreateMessage(MessageType type, std::string message, char * data);
     void MoveMessageHead(char*& data, size_t& length, size_t stepSize);
     void Broadcast(std::string message);
     void Broadcast(Package& package);
     void SendSnapshot();
     void SendPing();
     void CheckForTimeOuts();
-    int  CreateHeader(MessageType type, char* data);
     void Disconnect(int i);
     void ParseMessageType(char* data, size_t length);
     void ParseEvent(char* data, size_t length);
@@ -65,6 +61,7 @@ private:
     void ParseClientPing();
     void ParseServerPing();
     void ParseSnapshot(char* data, size_t length);
+    void IdentifyPacketLoss();
 };
 
 #endif

src/Engine/Network/Client.cpp

@@ -6,7 +6,7 @@ using namespace boost::asio::ip;
 Client::Client() : m_Socket(m_IOService)
 {
     // Set up network stream
-    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.2"), 13);
+    m_ReceiverEndpoint = udp::endpoint(boost::asio::ip::address::from_string("192.168.1.6"), 13);
 	m_NextSnapshot.InputForward = "";
 	m_NextSnapshot.InputRight = "";
 }
@@ -68,14 +68,13 @@ void Client::ReadFromServer()
             SendSnapshotToServer();
             previousSnapshotMessage = currentTime;
         }
-
     }
 }
 
 void Client::SendSnapshotToServer()
 {
     // Reset previouse key state in snapshot.
-		Package message(MessageType::Event);
+		Package message(MessageType::Event, m_SendPacketID);
 		message.AddString(m_NextSnapshot.InputForward);
 		Send(message);
     m_NextSnapshot.InputRight = "";
@@ -97,12 +96,12 @@ void Client::SendSnapshotToServer()
     }
 
     if (m_NextSnapshot.InputForward != "") {
-	Package message(MessageType::Event);
+	Package message(MessageType::Event, m_SendPacketID);
 	message.AddString(m_NextSnapshot.InputForward);
 	Send(message);
     }
     if (m_NextSnapshot.InputRight != "") {
-		Package message(MessageType::Event);
+		Package message(MessageType::Event, m_SendPacketID);
 		message.AddString(m_NextSnapshot.InputRight);
 		Send(message);
     }
@@ -115,8 +114,8 @@ void Client::ParseMessageType(char* data, size_t length)
     MoveMessageHead(data, length, sizeof(int)); // Move the message head to know where to read from
 
 	// Read packet ID 
-	m_PreviousPacketID = m_PacketID;
+	m_PreviousPacketID = m_PacketID;    // Set previous packet id
-	memcpy(&m_PacketID, data, sizeof(int)); 
+	memcpy(&m_PacketID, data, sizeof(int)); //Read new packet id
 	MoveMessageHead(data, length, sizeof(int)); 
 	IdentifyPacketLoss();
 
@@ -160,7 +159,7 @@ void Client::ParsePing()
 
 void Client::ParseServerPing()
 {
-	Package message(MessageType::ServerPing);
+	Package message(MessageType::ServerPing, m_SendPacketID);
 	message.AddString("Ping recieved");
 	Send(message);
     //std::cout << "Parsing ping." << std::endl;
@@ -228,8 +227,10 @@ int Client::Receive(char* data, size_t length)
         m_ReceiverEndpoint,
         0, error);
    
-    std::cout << "ReadFromServer crashed: " << error.message();
+    if (error) {
-    
+        std::cout << "ReadFromServer crashed: " << error.message();
+    }
+
     return bytesReceived;
 }
 
@@ -243,7 +244,7 @@ void Client::Send(Package& package)
 
 void Client::Connect()
 {
-	Package message(MessageType::Connect);
+	Package message(MessageType::Connect, m_SendPacketID);
 	message.AddString(m_PlayerName);
 	m_StartPingTime = std::clock();
 	Send(message);
@@ -251,14 +252,14 @@ void Client::Connect()
 
 void Client::Disconnect()
 {
-	Package message(MessageType::Connect);
+	Package message(MessageType::Connect, m_SendPacketID);
 	message.AddString("+Disconnect");
 	Send(message);
 }
 
 void Client::Ping()
 {
-	Package message(MessageType::Connect);
+	Package message(MessageType::Connect, m_SendPacketID);
 	message.AddString("Ping"); 
 	m_StartPingTime = std::clock();
 	Send(message);
@@ -272,22 +273,17 @@ void Client::MoveMessageHead(char*& data, size_t& length, size_t stepSize)
 
 bool Client::OnKeyDown(const Events::KeyDown& event)
 {
-    char* dataPackage = new char[INPUTSIZE]; // The package that will be sent to the server, when filled
     if (event.KeyCode == GLFW_KEY_W) {
         m_IsWASDKeyDown.W = true;
-        //m_NextSnapshot.inputForward = "+Forward";
     }
     if (event.KeyCode == GLFW_KEY_A) {
         m_IsWASDKeyDown.A = true;
-        //m_NextSnapshot.inputRight = "-Right";
     }
     if (event.KeyCode == GLFW_KEY_S) {
         m_IsWASDKeyDown.S = true;
-        //m_NextSnapshot.inputForward = "-Forward";
     }
     if (event.KeyCode == GLFW_KEY_D) {
         m_IsWASDKeyDown.D = true;
-        //m_NextSnapshot.inputRight = "+Right";
     }
 
     if (event.KeyCode == GLFW_KEY_V) {
@@ -299,8 +295,6 @@ bool Client::OnKeyDown(const Events::KeyDown& event)
     if (event.KeyCode == GLFW_KEY_P) {
         Ping();
     }
-    memset(dataPackage, 0, INPUTSIZE);
-    delete[] dataPackage;
     return true;
 }
 
@@ -308,7 +302,6 @@ bool Client::OnKeyUp(const Events::KeyUp & e)
 {
     if (e.KeyCode == GLFW_KEY_W) {
         m_IsWASDKeyDown.W = false;
-        //m_NextSnapshot.inputForward = "";
         return true;
     }
     if (e.KeyCode == GLFW_KEY_A){
@@ -321,7 +314,6 @@ bool Client::OnKeyUp(const Events::KeyUp & e)
     }
     if (e.KeyCode == GLFW_KEY_D) {
         m_IsWASDKeyDown.D = false;
-        //m_NextSnapshot.inputRight = "";
         return true;
     }
     return false;

src/Engine/Network/Package.cpp

@@ -1,12 +1,14 @@
 #include "Network/Package.h"
 
-Package::Package(MessageType type)
+Package::Package(MessageType type,unsigned int& packageID)
 {
 	// Create message header
 	// Add message type
 	int messageType = static_cast<int>(type);
-	memcpy(m_Data, &messageType, sizeof(int));
+    Package::AddPrimitive<int>(messageType);
-	m_Offset += sizeof(int);
+    packageID = packageID % 1000; // Packet id modulos
+    Package::AddPrimitive<int>(packageID);
+    packageID++;
 }
 
 Package::~Package()
@@ -14,8 +16,6 @@ Package::~Package()
 	delete[] m_Data;
 }
 
-
-
 void Package::AddString(std::string str)
 {
 	// Message, add one extra byte for null terminator

src/Engine/Network/Server.cpp

@@ -119,12 +119,18 @@ void Server::ParseMessageType(char * data, size_t length)
     memcpy(&messageType, data, sizeof(int)); // Read what type off message was sent from server
     MoveMessageHead(data, length, sizeof(int)); // Move the message head to know where to read from
 
+    // Read packet ID 
+    m_PreviousPacketID = m_PacketID;    // Set previous packet id
+    memcpy(&m_PacketID, data, sizeof(int)); //Read new packet id
+    MoveMessageHead(data, length, sizeof(int));
+    IdentifyPacketLoss();
+
     switch (static_cast<MessageType>(messageType)) {
     case MessageType::Connect:
         ParseConnect(data, length);
         break;
     case MessageType::ClientPing:
-        ParseClientPing();
+        //ParseClientPing();
         break;
     case MessageType::ServerPing:
         ParseServerPing();
@@ -172,27 +178,6 @@ void Server::Send(Package & package)
 		0);
 }
 
-int Server::CreateMessage(MessageType type, std::string message, char * data)
-{
-    int lengthOfMessage = 0;
-    int offset = 0;
-
-    lengthOfMessage = message.size();
-    // Message type
-    memcpy(data + offset, &type, sizeof(int));
-    offset += sizeof(int);
-	// Packet ID
-	m_PacketID = m_PacketCounter % PACKETMODULUS;
-	memcpy(data + offset, &m_PacketID, sizeof(int));
-	offset += sizeof(int);
-    // Message, add one extra byte for null terminator
-    memcpy(data + offset, message.data(), (lengthOfMessage + 1) * sizeof(char));
-    offset += (lengthOfMessage + 1) * sizeof(char);
-
-	m_PacketCounter++;
-    return offset;
-}
-
 void Server::MoveMessageHead(char *& data, size_t & length, size_t stepSize)
 {
     data += stepSize;
@@ -201,8 +186,7 @@ void Server::MoveMessageHead(char *& data, size_t & length, size_t stepSize)
 
 void Server::Broadcast(std::string message)
 {
-	Package package(MessageType::Event);
+	Package package(MessageType::Event, m_SendPacketID);
-	package.AddPrimitive<int>(12); // Input PackageID here
 	package.AddString(message);
     for (int i = 0; i < MAXCONNECTIONS; i++) {
         if (m_PlayerDefinitions[i].Endpoint.address() != boost::asio::ip::address()) {
@@ -222,8 +206,7 @@ void Server::Broadcast(Package& package)
 
 void Server::SendSnapshot()
 {
-	Package package(MessageType::Snapshot);
+	Package package(MessageType::Snapshot, m_SendPacketID);
-	package.AddPrimitive<int>(12); // Input PackageID here
 	for (size_t i = 0; i < MAXCONNECTIONS; i++) {
 		if (m_PlayerDefinitions[i].EntityID == -1) {
 			continue;
@@ -249,8 +232,7 @@ void Server::SendPing()
     }
 
     // Create ping message
-	Package package(MessageType::ServerPing);
+	Package package(MessageType::ServerPing, m_SendPacketID);
-	package.AddPrimitive<int>(12); // Input PackageID here
 	package.AddString("Ping from server");
 	// Time message
     m_StartPingTime = std::clock();
@@ -277,20 +259,6 @@ void Server::CheckForTimeOuts()
     }
 }
 
-int Server::CreateHeader(MessageType type, char * data)
-{
-    int messageType = static_cast<int>(type);
-    int offset = 0;
-    memcpy(data, &messageType, sizeof(int));
-    offset += sizeof(int);
-	m_PacketID = m_PacketCounter % PACKETMODULUS;
-	memcpy(data + offset, &m_PacketID, sizeof(int));
-	offset += sizeof(int);
-	m_PacketCounter++;
-
-    return offset;
-}
-
 void Server::Disconnect(int i)
 {
     Broadcast("A player disconnected");
@@ -369,8 +337,7 @@ void Server::ParseConnect(char * data, size_t length)
             std::cout << m_PacketID << ": Player \"" << m_PlayerDefinitions[i].Name << "\" connected on IP: " <<
                 m_PlayerDefinitions[i].Endpoint.address().to_string() << std::endl;
 
-			Package package(MessageType::Connect);
+			Package package(MessageType::Connect, m_SendPacketID);
-			package.AddPrimitive<int>(12); // Input PackageID here
 			package.AddPrimitive<int>(i); // Player ID
            
 			Send(package, i);
@@ -400,10 +367,9 @@ void Server::ParseClientPing()
 {
 	std::cout << m_PacketID << ":Parsing ping." << std::endl;
 	// Return ping
-	Package package(MessageType::ClientPing);
+	Package package(MessageType::ClientPing, m_SendPacketID);
-	package.AddPrimitive<int>(12); // Insert packet ID here
 	package.AddString("Ping received");
-	Send(package);
+	Send(package); // This dosen't work for multiple users
 }
 
 void Server::ParseServerPing()
@@ -429,4 +395,15 @@ void Server::ParseSnapshot(char * data, size_t length)
                 0);
         }
     }
-}
+}
+
+void Server::IdentifyPacketLoss()
+{
+    // if no packets lost, difference should be equal to 1
+    int difference = m_PacketID - m_PreviousPacketID;
+    if (difference != 1) {
+        for (int i = m_PreviousPacketID + 1; i < m_PacketID; i++) {
+            LOG_INFO("Packet %i was lost...", i);
+        }
+    }
+}

src/Tests/WorldTest.cpp

@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(WorldTestMultipleAllocations, * utf::tolerance(0.00001))
 
     // Loop through them and check data
     int i = 0;
-    for (auto& c : w.GetComponents("Test")) {
+    for (auto& c : *w.GetComponents("Test")) {
         BOOST_TEST((int)c["TestInteger"] == i);
         i++;
     }