Added an event to search for servers.

Client now broadcasts a serverlistrequest.
An active server will then answer the request and send info about the server.
The client saves this data to a list and presents it to the user.

include/Engine/Network/Client.h

@@ -14,7 +14,6 @@
 #include "Network/MessageType.h"
 #include "Network/PlayerDefinition.h"
 #include "Network/UDPClient.h"
-#include "Network/UDPServer.h" //LOL
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
@@ -25,6 +24,19 @@
 #include "Network/EInterpolate.h"
 #include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
+#include "Network/ESearchForServers.h"
+
+struct ServerInfo
+{
+    ServerInfo(std::string a, int b, std::string c, int d)
+    {
+        Address = a; Port = b; Name = c; PlayersConnected = d;
+    }
+    std::string Address = "";
+    int Port = 0;
+    std::string Name = "";
+    int PlayersConnected = 0;
+};
 
 class Client : public Network
 {
@@ -83,10 +95,11 @@ public:
     void parseTCPConnect(Packet& packet);
     void parsePlayerConnected(Packet& packet);
     void parsePing();
-    void parseHeartbeat(Packet& packet, PlayerDefinition);
+    void parseServerlist(Packet& packet);
     void parseKick();
     void parsePlayersSpawned(Packet& packet);
     void parseEntityDeletion(Packet& packet);
+    void parsePlayerDamage(Packet& packet);
     void parseComponentDeletion(Packet& packet);
     void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
     void parseSnapshot(Packet& packet);
@@ -96,6 +109,7 @@ public:
     void sendInputCommands();
     void sendLocalPlayerTransform();
     void becomePlayer();
+    void displayServerlist();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -111,11 +125,16 @@ public:
     bool OnPlayerDamage(const Events::PlayerDamage& e);
     EventRelay<Client, Events::PlayerSpawned> m_EPlayerSpawned;
     bool OnPlayerSpawned(const Events::PlayerSpawned& e);
-    void parsePlayerDamage(Packet& packet);
+    EventRelay< Client, Events::SearchForServers> m_ESearchForServers;
+    bool OnSearchForServers(const Events::SearchForServers& e);
 private:
     UDPClient m_Unreliable;
-    UDPServer m_Heartbeat;
+    UDPClient m_ServerlistRequest;
     TCPClient m_Reliable;
+    std::vector<ServerInfo> m_Serverlist;
+    bool m_SearchingForServers = false;
+    std::clock_t m_StartSearchTime;
+    double m_SearchingTime = 2000; // Config I guess
 };
 
 #endif

include/Engine/Network/ESearchForServers.h

@@ -0,0 +1,12 @@
+#ifndef Events_SearchForServers_h__
+#define Events_SearchForServers_h__
+
+#include "Core/Event.h"
+
+namespace Events
+{
+
+struct SearchForServers : public Event { };
+
+}
+#endif

include/Engine/Network/MessageType.h

@@ -19,7 +19,7 @@ enum class MessageType
     EntityDeleted,
     ComponentDeleted,
     PlayerTransform,
-    Heartbeat,
+    ServerlistRequest,
     Invalid
 };
 

include/Engine/Network/Server.h

@@ -33,7 +33,7 @@ private:
     // Network channels
     TCPServer m_Reliable;
     UDPServer m_Unreliable;
-    UDPClient m_Heartbeat;
+    UDPServer m_ServerlistRequest;
     // dont forget to set these in the childrens receive logic
     boost::asio::ip::address m_Address;
     int m_Port = 27666;
@@ -46,13 +46,11 @@ private:
     // time for previouse message
     std::clock_t previousePingMessage = std::clock();
     std::clock_t previousSnapshotMessage = std::clock();
-    std::clock_t previousHeartbeat = std::clock();
     std::clock_t timOutTimer = std::clock();
 
     // How often we send messages (milliseconds)
     float pingIntervalMs;
     float snapshotInterval;
-    float heartbeatInterval = 5000;
     int checkTimeOutInterval = 100;
     int m_NextPlayerID = 0;
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
@@ -71,7 +69,6 @@ private:
     void addChildrenToPacket(Packet& packet, EntityID entityID);
     void addInputCommandsToPacket(Packet& packet);
     void sendPing();
-    void sendHeartBeat();
     void checkForTimeOuts();
     void disconnect(PlayerID playerID);
     void parseMessageType(Packet& packet);
@@ -86,6 +83,7 @@ private:
     void parseUDPConnect(Packet & packet);
     void parseTCPConnect(Packet & packet);
     void parseDisconnect();
+    void parseServerlistRequest(boost::asio::ip::udp::endpoint endpoint);
     bool shouldSendToClient(EntityWrapper childEntity);
 
     // Debug event

include/Engine/Network/TCPServer.h

@@ -16,8 +16,9 @@ public:
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet);
     void Disconnect();
-    int Port() { return acceptor->local_endpoint().port(); }
-    std::string Address();
+    int Port() { return m_Port; }
+    std::string Address() { return m_Address; }
+
 private:
     // TCP logic
     boost::asio::io_service m_IOService;
@@ -28,6 +29,10 @@ private:
         int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers,
         const boost::system::error_code& error);
     int readBuffer(char* data, PlayerDefinition& playerDefinition);
+    int GetPort();
+    std::string GetAddress();
+    int m_Port = 0;
+    std::string m_Address = "";
 };
 
 #endif

include/Engine/Network/UDPClient.h

@@ -14,6 +14,7 @@ public:
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);
+    void Broadcast(Packet& packet, int port);
     bool IsSocketAvailable();
 private:
     // Assio UDP logic

include/Engine/Network/UDPServer.h

@@ -13,7 +13,9 @@ public:
     void AcceptNewConnections(int& nextPlayerID, std::map<PlayerID, PlayerDefinition>& connectedPlayers);
     void Receive(Packet & packet, PlayerDefinition & playerDefinition);
     void Send(Packet & packet, PlayerDefinition & playerDefinition);
-    void Send(Packet & packet);
+    void Send(Packet & packet); 
+    void Send(Packet & packet, boost::asio::ip::udp::endpoint endpoint);
+    void Broadcast(Packet & packet, int port);
     bool IsSocketAvailable();
 private:
     // UDP logic