TCP and UDP Client are working for 1 connected player, more players are not tested yet

include/Engine/Network/Client.h

@@ -35,7 +35,7 @@ protected:
     int port = 0;
     // Sending message to server logic
     int bytesRead = -1;
-    char readBuf[INPUTSIZE] = { 0 };
+    char readBuffer[BUFFERSIZE] = { 0 };
 
     // Packet loss logic
     PacketID m_PacketID = 0;
@@ -68,7 +68,7 @@ protected:
     // Private member functions
     virtual void send(Packet& packet) = 0;
     virtual void readFromServer() = 0;
-    void connect();
+    virtual void connect() = 0;
     void disconnect();
     void parseMessageType(Packet& packet);
     void updateFields(Packet& packet, const ComponentInfo& componentInfo, const EntityID& entityID, const std::string& componentType);

include/Engine/Network/HybridClient.h

@@ -16,6 +16,7 @@ private:
     boost::asio::io_service m_IOService;
     boost::asio::ip::udp::socket m_Socket;
 
+    void connect();
     void readFromServer();
     int receive(char * data);
     void send(Packet & packet);

include/Engine/Network/HybridServer.h

@@ -13,18 +13,13 @@ private:
     // UDP logic
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::udp::socket> m_Socket;
+    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
 
     void readFromClients();
-    void parseClientPing();
-    void parsePing();
-    void parseDisconnect();
     void parseConnect(Packet & packet);
-    void parseOnInputCommand(Packet & packet);
-    void parsePlayerTransform(Packet & packet);
     void send(Packet & packet, PlayerDefinition & playerDefinition);
     void send(Packet & packet);
     int receive(char * data);
-    PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
 };
 
 #endif

include/Engine/Network/Network.h

@@ -12,7 +12,7 @@
 #include <fstream>
 #include <iostream>
 
-#define INPUTSIZE 32000
+#define BUFFERSIZE 32000
 typedef unsigned int PlayerID;
 typedef unsigned int PacketID;
 

include/Engine/Network/Packet.h

@@ -49,6 +49,8 @@ public:
     void WriteData(char* data, int sizeOfData);
     // Pops the first element as if it was a string.
     std::string ReadString();
+    // Update size of packet variable in header
+    void UpdateSize();
     char* ReadData(int SizeOfData);
     void ChangePacketID(unsigned int& packetID);
     int Size() { return m_Offset; };

include/Engine/Network/PlayerDefinition.h

@@ -10,6 +10,8 @@ struct PlayerDefinition {
     boost::asio::ip::udp::endpoint Endpoint;
     unsigned int PacketID;
     std::clock_t StopTime;
+    boost::asio::ip::address Address;
+    unsigned short Port;
     // use for tcp connections
     boost::shared_ptr<boost::asio::ip::tcp::socket> TCPSocket;
 };

include/Engine/Network/Server.h

@@ -25,12 +25,13 @@ public:
     void Start(World* m_world, EventBroker *eventBroker) override;
     void Update() override;
 protected:
-    template<class T>
-    T m_ReceiverEndpoint;
+    // dont forget to set these in the childrens receive logic
+    boost::asio::ip::address m_Address;
+    unsigned short m_Port;
     // Sending messages to client logic
     std::map<PlayerID, PlayerDefinition> m_ConnectedPlayers;
     // HACK: Fix INPUTSIZE
-    char readBuffer[INPUTSIZE] = { 0 };
+    char readBuffer[BUFFERSIZE] = { 0 };
     int bytesRead = 0;
     // time for previouse message
     std::clock_t previousePingMessage = std::clock();
@@ -65,15 +66,17 @@ protected:
     void parseOnPlayerDamage(Packet& packet);
     void identifyPacketLoss();
     void kick(PlayerID player);
+    PlayerID GetPlayerIDFromEndpoint();
+    void parsePlayerTransform(Packet& packet);
+    void parseOnInputCommand(Packet& packet);
+    void parseClientPing();
+    void parsePing();
+    void parseDisconnect();
     // Pure virtual functions
-    virtual void parseOnInputCommand(Packet& packet) = 0;
     virtual void readFromClients() = 0;
     virtual void send(Packet& packet, PlayerDefinition & playerDefinition) = 0;
     virtual void send(Packet& packet) = 0;
     virtual void parseConnect(Packet& packet) = 0;
-    virtual void parseDisconnect() = 0;
-    virtual void parseClientPing() = 0;
-    virtual void parsePing() = 0;
     // Debug event
     EventRelay<Server, Events::InputCommand> m_EInputCommand;
     bool OnInputCommand(const Events::InputCommand& e);
@@ -83,7 +86,6 @@ protected:
     bool OnEntityDeleted(const Events::EntityDeleted& e);
     EventRelay<Server, Events::ComponentDeleted> m_EComponentDeleted;
     bool OnComponentDeleted(const Events::ComponentDeleted& e);
-    virtual void parsePlayerTransform(Packet& packet) = 0;
 };
 
 #endif

include/Engine/Network/TCPClient.h

@@ -15,6 +15,7 @@ private:
     boost::asio::io_service m_IOService;
     boost::shared_ptr<boost::asio::ip::tcp::socket> m_Socket;
 
+    void connect();
     void readFromServer();
     int receive(char * data);
     void send(Packet & packet);

include/Engine/Network/TCPServer.h

@@ -8,30 +8,19 @@ class TCPServer : public Server
 public:
     TCPServer();
     ~TCPServer();
-
 private:
     // TCP logic
-    boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
     boost::asio::io_service m_IOService;
     std::unique_ptr<boost::asio::ip::tcp::acceptor> acceptor;
     boost::shared_ptr<boost::asio::ip::tcp::socket> lastReceivedSocket;
 
-    void Start(World* world, EventBroker* eventBroker);
     void readFromClients();
     void acceptNewConnections();
     void handle_accept(boost::shared_ptr<boost::asio::ip::tcp::socket> socket, const boost::system::error_code & error);
-    void parseDisconnect();
     void parseConnect(Packet & packet);
-    ///// Implement method to get which player it was
-    void parseClientPing();
-    void parsePing();
-    void parseOnInputCommand(Packet & packet);
-    void parsePlayerTransform(Packet & packet);
-    /////////////////////////
     void send(Packet & packet, PlayerDefinition & playerDefinition);
     void send(Packet & packet);
     int receive(char * data, boost::asio::ip::tcp::socket& socket);
-    PlayerID GetPlayerIDFromEndpoint(boost::asio::ip::udp::endpoint endpoint);
 };
 
 #endif