Reorganized and cleaned up the solution.

Source/Discovery Server/DiscoveryServer.cpp

@@ -0,0 +1,153 @@
+// ╔═╗ ╦ ╦ ╔═╗ ╔╦╗ ╔═╗ ╦ ╔═╗ ╔╗╔ ╔═╗
+// ║   ╠═╣ ╠═╣ ║║║ ╠═╝ ║ ║ ║ ║║║ ╚═╗
+// ╚═╝ ╩ ╩ ╩ ╩ ╩ ╩ ╩   ╩ ╚═╝ ╝╚╝ ╚═╝                      
+// ╔╦╗╦╔═╗╔═╗╔═╗╦  ╦╔═╗╦═╗╦ ╦  ╔═╗╔═╗╦═╗╦  ╦╔═╗╦═╗
+//  ║║║╚═╗║  ║ ║╚╗╔╝║╣ ╠╦╝╚╦╝  ╚═╗║╣ ╠╦╝╚╗╔╝║╣ ╠╦╝
+// ═╩╝╩╚═╝╚═╝╚═╝ ╚╝ ╚═╝╩╚═ ╩   ╚═╝╚═╝╩╚═ ╚╝ ╚═╝╩╚═
+
+#include "Discovery Server/DiscoveryServer.hpp"
+
+#include "Common/ByteStream.hpp"
+#include "Game/RealmUserManager.hpp"
+#include "Game/GameSessionManager.hpp"
+#include "logging.hpp"
+
+DiscoveryServer::DiscoveryServer()
+{
+	m_running = false;
+
+	m_socket = INVALID_SOCKET;
+	m_recvBuffer.resize( 1024 );
+}
+
+DiscoveryServer::~DiscoveryServer()
+{
+	Log::Info( "Discovery Server stopped." );
+}
+
+void DiscoveryServer::Start( std::string ip, int32_t port )
+{
+	m_socket = socket( AF_INET, SOCK_DGRAM, 0 );
+
+	if( m_socket == INVALID_SOCKET )
+	{
+		Log::Error( "Failed to create socket." );
+		return;
+	}
+
+	sockaddr_in service{};
+	service.sin_family = AF_INET;
+	service.sin_port = htons( port );
+
+	if( ip == "0.0.0.0" )
+	{
+		service.sin_addr.s_addr = INADDR_ANY;
+	}
+	else
+	{
+		if( InetPtonA( AF_INET, ip.c_str(), &service.sin_addr ) != 1 )
+		{
+			Log::Error( "Invalid IP address format: {}", ip );
+			closesocket( m_socket );
+			return;
+		}
+	}
+
+	if( bind( m_socket, reinterpret_cast< SOCKADDR * >( &service ), sizeof( service ) ) == SOCKET_ERROR )
+	{
+		Log::Error( "Failed to bind socket." );
+		closesocket( m_socket );
+		return;
+	}
+
+	m_running = true;
+	m_thread = std::thread( &DiscoveryServer::Run, this );
+
+	Log::Info( "Discovery Server started {}:{}", ip, port );
+}
+
+void DiscoveryServer::Stop()
+{
+	m_running = false;
+	if( m_thread.joinable() )
+	{
+		m_thread.join();
+	}
+}
+
+void DiscoveryServer::Run()
+{
+	sockaddr_in clientAddr;
+	int clientAddrLen = sizeof( clientAddr );
+
+	while( m_running )
+	{
+		std::this_thread::sleep_for( std::chrono::milliseconds( 1 ) );
+
+		auto bytesReceived = recvfrom( m_socket, ( char * )m_recvBuffer.data(), 1024, 0, ( struct sockaddr * )&clientAddr, &clientAddrLen );
+
+		if( bytesReceived == SOCKET_ERROR || bytesReceived < 4 )
+		{
+			continue;
+		}
+
+		ProcessPacket( &clientAddr, std::make_shared< ByteBuffer >( m_recvBuffer.data(), bytesReceived ) );
+	}
+}
+
+void DiscoveryServer::ProcessPacket( sockaddr_in *clientAddr, sptr_byte_stream stream )
+{
+	if( 0x20 != stream->read_u32() )
+		return;
+
+	auto encryptedBytes = stream->read_bytes( 0x20 );
+	auto decryptedBytes = RealmCrypt::decryptSymmetric( encryptedBytes );
+
+	std::wstring sessionId( 16, L'\0' );
+	std::memcpy( sessionId.data(), decryptedBytes.data(), 0x20 );
+
+	// Validate the session ID is 16 characters long and not all 0's
+	if( sessionId.size() != 16 || std::all_of( sessionId.begin(), sessionId.end(), []( wchar_t ch )
+	{
+		return ch == L'\0';
+	} ) )
+	{
+		Log::Error( "Invalid session id." );
+		return;
+	}
+
+	// Get the users remote IP and Port for discovery.
+	char remoteIp[ INET_ADDRSTRLEN ];
+	InetNtopA( AF_INET, &clientAddr->sin_addr, remoteIp, INET_ADDRSTRLEN );
+
+	uint16_t remotePort = ntohs( clientAddr->sin_port );
+
+	// Find the user associated with the session ID
+	auto user = UserManager::Get().FindUserBySessionId( sessionId );
+	if( user == nullptr )
+	{
+		Log::Error( "User not found! [{}]", sessionId );
+		return;
+	}
+
+	if( remoteIp != user->sock->remote_ip )
+	{
+		Log::Error( "Discovery Handshake from invalid IP!" );
+		return;
+	}
+
+	// Initialize our discovery information
+	user->m_discoveryAddr = remoteIp;
+	user->m_discoveryPort = remotePort;
+
+	Log::Debug( "Discovery Handshake from {}:{}", remoteIp, remotePort );
+
+	if( user->m_isHost )
+	{
+		GameSessionManager::Get().RequestOpen( user );
+	}
+	else
+	{
+		GameSessionManager::Get().RequestJoin( user );
+	}
+}