Server: Commands: Listed connected sockets and matches now include time of connection/creation

Author: provigz

InternetGamesServer/Command.cpp

@@ -101,14 +101,20 @@ DWORD WINAPI CommandHandler(void*)
 				std::cout
 					<< std::endl
 					<< std::left << std::setw(17) << "IP"
+					<< std::setw(21) << "Connected since"
 					<< std::setw(31) << "Type"
 					<< std::setw(27) << "State"
 					<< "Match Joined (GUID)" << std::endl
-					<< std::string(115, '-') << std::endl;
+					<< std::string(134, '-') << std::endl;
 				for (const Socket* socket : Socket::GetList())
 				{
+					const std::time_t connectionTime = socket->GetConnectionTime();
+					std::tm localConnectionTime;
+					localtime_s(&localConnectionTime, &connectionTime);
+
 					std::cout
 						<< std::setw(15) << socket->GetAddressString() << "  "
+						<< std::put_time(&localConnectionTime, "%d/%m/%Y %H:%M:%S") << "  "
 						<< std::setw(29) << Socket::TypeToString(socket->GetType()) << "  ";
 					if (socket->GetPlayerSocket())
 					{
@@ -144,17 +150,23 @@ DWORD WINAPI CommandHandler(void*)
 			{
 				std::cout
 					<< std::endl
-					<< std::left << std::setw(8) << "Index"
+					<< std::left << std::setw(12) << "Index"
 					<< std::setw(40) << "GUID"
+					<< std::setw(21) << "Created on"
 					<< std::setw(7) << "Type"
 					<< std::setw(25) << "State"
 					<< "Game" << std::endl
-					<< std::string(105, '-') << std::endl;
+					<< std::string(130, '-') << std::endl;
 				for (const auto& match : MatchManager::Get().GetMatchesWin7())
 				{
+					const std::time_t creationTime = match->GetCreationTime();
+					std::tm localCreationTime;
+					localtime_s(&localCreationTime, &creationTime);
+
 					std::cout
-						<< std::right << std::setw(6) << match->GetIndex() << "  "
+						<< std::right << std::setw(10) << match->GetIndex() << "  "
 						<< std::left << match->GetGUID() << "  "
+						<< std::put_time(&localCreationTime, "%d/%m/%Y %H:%M:%S") << "  "
 						<< std::setw(7) << "Win7"
 						<< std::setw(25) << Win7::Match::StateToString(match->GetState())
 						<< Win7::Match::GameToNameString(match->GetGame())
@@ -163,9 +175,14 @@ DWORD WINAPI CommandHandler(void*)
 				}
 				for (const auto& match : MatchManager::Get().GetMatchesWinXP())
 				{
+					const std::time_t creationTime = match->GetCreationTime();
+					std::tm localCreationTime;
+					localtime_s(&localCreationTime, &creationTime);
+
 					std::cout
-						<< std::right << std::setw(6) << match->GetIndex() << "  "
+						<< std::right << std::setw(10) << match->GetIndex() << "  "
 						<< std::left << match->GetGUID() << "  "
+						<< std::put_time(&localCreationTime, "%d/%m/%Y %H:%M:%S") << "  "
 						<< std::setw(7) << "WinXP"
 						<< std::setw(25) << WinXP::Match::StateToString(match->GetState())
 						<< WinXP::Match::GameToNameString(match->GetGame())

InternetGamesServer/Match.hpp

@@ -30,6 +30,7 @@ class Match
 	virtual int8_t GetRequiredPlayerCount() const { return 2; }
 	inline unsigned int GetIndex() const { return m_index; }
 	inline REFGUID GetGUID() const { return m_guid; }
+	inline std::time_t GetCreationTime() const { return m_creationTime; }
 
 protected:
 	void AddPlayer(P& player)

InternetGamesServer/Socket.cpp

@@ -241,6 +241,7 @@ Socket::GetAddressString(SOCKET socket, const char portSeparator)
 Socket::Socket(SOCKET socket, std::ostream& log) :
 	m_socket(socket),
 	m_log(log),
+	m_connectionTime(std::time(nullptr)),
 	m_disconnected(false),
 	m_type(UNKNOWN),
 	m_playerSocket(nullptr)

InternetGamesServer/Socket.hpp

@@ -67,9 +67,6 @@ class Socket final
 	Socket(SOCKET socket, std::ostream& log);
 	~Socket();
 
-	inline Type GetType() const { return m_type; }
-	inline PlayerSocket* GetPlayerSocket() const { return m_playerSocket; }
-
 	void Disconnect();
 
 	/** Receive data */
@@ -193,10 +190,14 @@ class Socket final
 	inline SOCKET GetRaw() const { return m_socket; }
 	inline std::string GetAddressString() const { return GetAddressString(m_socket); }
 	inline bool IsDisconnected() const { return m_disconnected; }
+	inline std::time_t GetConnectionTime() const { return m_connectionTime; }
+	inline Type GetType() const { return m_type; }
+	inline PlayerSocket* GetPlayerSocket() const { return m_playerSocket; }
 
 private:
 	const SOCKET m_socket;
 	std::ostream& m_log;
+	const std::time_t m_connectionTime;
 
 	bool m_disconnected;