Moving RequestGetServerAddress into the Lobby Server.

Lobby Server/Event/RequestGetServerAddress.cpp

@@ -1,12 +1,12 @@
 #include "../../global_define.h"
-#include "GetServerAddressEvent.h"
+#include "RequestGetServerAddress.h"
 
 void RequestGetServerAddress::Deserialize( sptr_byte_stream stream )
 {
 	DeserializeHeader( stream );
 }
 
-sptr_generic_response RequestGetServerAddress::ProcessRequest( sptr_byte_stream stream )
+sptr_generic_response RequestGetServerAddress::ProcessRequest( sptr_user user, sptr_byte_stream stream )
 {
 	Deserialize( stream );
 

Lobby Server/Event/RequestGetServerAddress.h

@@ -6,7 +6,8 @@ public:
 	{
 		return std::make_unique< RequestGetServerAddress >();
 	}
-	sptr_generic_response ProcessRequest( sptr_byte_stream stream ) override;
+
+	sptr_generic_response ProcessRequest( sptr_user user, sptr_byte_stream stream ) override;
 	void Deserialize( sptr_byte_stream stream ) override;
 };
 

Lobby Server/EventLookup.h

@@ -1,95 +0,0 @@
-#pragma once
-
-#include <map>
-#include <functional>
-
-#include "Event/RequestCancelGame.h"
-#include "Event/RequestCreateAccount.h"
-#include "Event/RequestCreatePrivateGame.h"
-#include "Event/RequestCreatePublicGame.h"
-#include "Event/RequestGetGame.h"
-#include "Event/RequestGetRealmStats.h"
-#include "Event/RequestLogin.h"
-#include "Event/RequestLogout.h"
-#include "Event/RequestMatchGame.h"
-#include "Event/RequestTouchSession.h"
-#include "Event/RequestDoClientDiscovery.h"
-#include "Event/RequestGetEncryptionKey.h"
-#include "Event/RequestGetRules.h"
-#include "Event/RequestUpdateGameData.h"
-
-const std::map< int16_t, std::function< std::unique_ptr< GenericRequest >() > > LOBBY_REQUEST_EVENT =
-{
-	{ 0x0005, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestCancelGame >();
-		}
-	},
-	{ 0x0006, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestCreateAccount >();
-		}
-	},
-	{ 0x0008, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestCreatePrivateGame >();
-		}
-	},
-	{ 0x000A, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestCreatePublicGame >();
-		}
-	},
-	{ 0x000D, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestGetGame >();
-		}
-	},
-	{ 0x000F, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestGetRealmStats >();
-		}
-	},
-	{ 0x0016, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestLogin >();
-		}
-	},
-	{ 0x0017, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestLogout >();
-		}
-	},
-	{ 0x0018, []() -> std::unique_ptr< GenericRequest >
-		{
-			return std::make_unique< RequestMatchGame >();
-		}
-	},
-	{ 0x0024, []() -> std::unique_ptr< GenericRequest >
-		{
-		return std::make_unique< RequestTouchSession >();
-		}
-	},
-	{ 0x0025, []() -> std::unique_ptr< GenericRequest >
-		{
-		return std::make_unique< RequestDoClientDiscovery >();
-		}
-	},
-	{ 0x0027, []() -> std::unique_ptr< GenericRequest >
-		{
-		return std::make_unique< RequestGetEncryptionKey >();
-		}
-	},
-	{ 0x0042, []() -> std::unique_ptr< GenericRequest >
-		{
-		return std::make_unique< RequestGetRules >();
-		}
-	},
-	{
-	 0x0044, []() -> std::unique_ptr< GenericRequest >
-	  {
-	  return std::make_unique< RequestUpdateGameData >();
-	  }
-	}
-
-};

Lobby Server/LobbyEvents.h

@@ -14,6 +14,7 @@
 #include "Event/RequestMatchGame.h"
 #include "Event/RequestTouchSession.h"
 #include "Event/RequestDoClientDiscovery.h"
+#include "Event/RequestGetServerAddress.h"
 #include "Event/RequestGetEncryptionKey.h"
 #include "Event/RequestGetRules.h"
 #include "Event/RequestUpdateGameData.h"
@@ -85,6 +86,11 @@ const std::map< int16_t, std::function< std::unique_ptr< GenericRequest >() > >
 		return std::make_unique< RequestGetRules >();
 		}
 	},
+	{ 0x0043, []() -> std::unique_ptr< GenericRequest >
+		{
+		return std::make_unique< RequestGetServerAddress >();
+		}
+	},
 	{
 	 0x0044, []() -> std::unique_ptr< GenericRequest >
 	  {

Lobby Server/LobbyServer.cpp

@@ -295,8 +295,6 @@ void LobbyServer::WriteSocket( sptr_socket socket )
 
 void LobbyServer::HandleRequest( sptr_socket socket, sptr_byte_stream stream )
 {
-	//Log::Packet( stream->data, stream->data.size(), false );
-
 	auto packetId = stream->read< uint16_t >();
 	stream->set_position( 0 );