Fleshed out ClientManager

* Fleshed out the ClientManager internals
* Folded some ServerApplication methods into ClientManager
* Removed Manager references from ServerApplication
* Corrected server_methods.cpp (compiles)

server/clients/client_manager.cpp

@@ -21,46 +21,89 @@
 */
 #include "client_manager.hpp"
 
+#include "udp_network_utility.hpp"
+
+#include <chrono>
+
+int ClientManager::CheckConnections() {
+	for (auto& it : elementMap) {
+		//3 seconds between beats
+		if (ClientData::Clock::now() - it.second.GetLastBeat() > std::chrono::seconds(3)) {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			UDPNetworkUtility::GetSingleton().SendTo(it.second.GetAddress(), &newPacket);
+			it.second.IncrementAttempts();
+		}
+	}
+
+	for (auto& it : elementMap) {
+		if (it.second.GetAttempts() > 2) {
+			int ret = it.first;
+			elementMap.erase(it.first);
+			return ret;
+		}
+	}
+
+	return -1;
+}
+
+void ClientManager::HandlePong(ServerPacket* const argPacket) {
+	//find and update the specified client
+	for (auto& it : elementMap) {
+		if (it.second.GetAddress().host == argPacket->srcAddress.host &&
+			it.second.GetAddress().port == argPacket->srcAddress.port
+			) {
+			it.second.ResetAttempts();
+			return;
+		}
+	}
+}
+
 int ClientManager::Create(IPaddress add) {
-	//TODO
-}
-
-int ClientManager::Load(IPaddress add) {
-	//TODO
-}
-
-int ClientManager::Save(int uid) {
-	//TODO
+	ClientData& client = elementMap[counter];
+	client.SetAddress(add);
+	return counter++;
 }
 
 void ClientManager::Unload(int uid) {
-	//TODO
-}
-
-void ClientManager::Delete(int uid) {
-	//TODO
+	elementMap.erase(uid);
 }
 
 void ClientManager::UnloadAll() {
-	//TODO
+	elementMap.clear();
 }
 
 void ClientManager::UnloadIf(std::function<bool(std::pair<const int, ClientData>)> fn) {
-	//TODO
+	std::map<int, ClientData>::iterator it = elementMap.begin();
+	while (it != elementMap.end()) {
+		if (fn(*it)) {
+			it = elementMap.erase(it);
+			//TODO: ? disconnect, unload characters, notify other clients
+		}
+		else {
+			++it;
+		}
+	}
 }
 
 ClientData* ClientManager::Get(int uid) {
-	//TODO
+	std::map<int, ClientData>::iterator it = elementMap.find(uid);
+
+	if (it == elementMap.end()) {
+		return nullptr;
+	}
+
+	return &it->second;
 }
 
 int ClientManager::GetLoadedCount() {
-	//TODO
+	return elementMap.size();
 }
 
 int ClientManager::GetTotalCount() {
-	//TODO
+	return elementMap.size();
 }
 
 std::map<int, ClientData>* ClientManager::GetContainer() {
-	//TODO
+	return &elementMap;
 }

server/clients/client_manager.hpp

@@ -24,6 +24,7 @@
 
 #include "client_data.hpp"
 #include "manager_interface.hpp"
+#include "server_packet.hpp"
 #include "singleton.hpp"
 
 #include "SDL/SDL_net.h"
@@ -31,16 +32,17 @@
 #include <functional>
 
 class ClientManager:
-	Singleton<ClientManager>,
-	ManagerInterface<ClientData, IPaddress>
+	public Singleton<ClientManager>,
+	public ManagerInterface<ClientData, IPaddress>
 {
 public:
+	//methods
+	int CheckConnections();
+	void HandlePong(ServerPacket* const argPacket);
+
 	//common public methods
 	int Create(IPaddress) override;
-	int Load(IPaddress) override;
-	int Save(int uid) override;
 	void Unload(int uid) override;
-	void Delete(int uid) override;
 
 	void UnloadAll() override;
 	void UnloadIf(std::function<bool(std::pair<const int, ClientData>)> fn) override;
@@ -57,6 +59,11 @@ private:
 	ClientManager() = default;
 	~ClientManager() = default;
 
+	//EMPTY
+	int Load(IPaddress) override { return -1; }
+	int Save(int uid) override { return -1; }
+	void Delete(int uid) override { return; }
+
 	int counter = 0;
 };
 

server/clients/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../server_utilities ../../common/utilities
+INCLUDES+=. ../server_utilities ../../common/network ../../common/network/packet_types ../../common/utilities
 LIBS+=
 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))