From 952b7d87219f66c13016bc739487e5dc7d04759f Mon Sep 17 00:00:00 2001 From: Federico Cecchetto Date: Sat, 26 Feb 2022 01:58:01 +0100 Subject: [PATCH] Cleanup --- src/client/game/demonware/servers/auth3_server.cpp | 11 ----------- src/client/game/demonware/services/bdMatchMaking2.cpp | 8 ++++++++ src/client/game/demonware/services/bdMatchMaking2.hpp | 1 + src/client/game/demonware/services/bdStorage.cpp | 6 +++--- src/client/game/demonware/services/bdStorage.hpp | 2 +- src/client/game/demonware/services/bdUNK80.cpp | 8 ++++++++ src/client/game/demonware/services/bdUNK80.hpp | 1 + 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/client/game/demonware/servers/auth3_server.cpp b/src/client/game/demonware/servers/auth3_server.cpp index b273cd44..9ea470fa 100644 --- a/src/client/game/demonware/servers/auth3_server.cpp +++ b/src/client/game/demonware/servers/auth3_server.cpp @@ -49,10 +49,6 @@ namespace demonware std::string identity{}; std::string token{}; -#ifdef DEBUG - printf("%s\n", packet.data()); -#endif - rapidjson::Document j; j.Parse(packet.data(), packet.size()); @@ -136,9 +132,6 @@ namespace demonware auto seed = std::to_string(iv_seed); doc.AddMember("iv_seed", rapidjson::StringRef(seed.data(), seed.size()), doc.GetAllocator()); -#ifndef DEBUG - doc.AddMember("identity", rapidjson::StringRef(identity.data(), identity.size()), doc.GetAllocator()); -#endif doc.AddMember("client_ticket", rapidjson::StringRef(ticket_b64.data(), ticket_b64.size()), doc.GetAllocator()); doc.AddMember("server_ticket", rapidjson::StringRef(auth_data_b64.data(), auth_data_b64.size()), doc.GetAllocator()); @@ -166,10 +159,6 @@ namespace demonware raw_reply reply(result); -#ifdef DEBUG - printf("sending reply: %s\n", result.data()); -#endif - this->send_reply(&reply); #ifdef DEBUG diff --git a/src/client/game/demonware/services/bdMatchMaking2.cpp b/src/client/game/demonware/services/bdMatchMaking2.cpp index 7ac7b7a2..4e9a9ea8 100644 --- a/src/client/game/demonware/services/bdMatchMaking2.cpp +++ b/src/client/game/demonware/services/bdMatchMaking2.cpp @@ -9,6 +9,7 @@ namespace demonware this->register_task(2, &bdMatchMaking2::unk2); this->register_task(3, &bdMatchMaking2::unk3); this->register_task(5, &bdMatchMaking2::unk5); + this->register_task(10, &bdMatchMaking2::unk10); this->register_task(16, &bdMatchMaking2::unk16); } @@ -40,6 +41,13 @@ namespace demonware reply->send(); } + void bdMatchMaking2::unk10(service_server* server, byte_buffer* /*buffer*/) const + { + // TODO: + auto reply = server->create_reply(this->task_id()); + reply->send(); + } + void bdMatchMaking2::unk16(service_server* server, byte_buffer* /*buffer*/) const { // TODO: diff --git a/src/client/game/demonware/services/bdMatchMaking2.hpp b/src/client/game/demonware/services/bdMatchMaking2.hpp index faea8e90..30fa4ee8 100644 --- a/src/client/game/demonware/services/bdMatchMaking2.hpp +++ b/src/client/game/demonware/services/bdMatchMaking2.hpp @@ -12,6 +12,7 @@ namespace demonware void unk2(service_server* server, byte_buffer* buffer) const; void unk3(service_server* server, byte_buffer* buffer) const; void unk5(service_server* server, byte_buffer* buffer) const; + void unk10(service_server* server, byte_buffer* buffer) const; void unk16(service_server* server, byte_buffer* buffer) const; }; } diff --git a/src/client/game/demonware/services/bdStorage.cpp b/src/client/game/demonware/services/bdStorage.cpp index f9ecf867..5a07ae03 100644 --- a/src/client/game/demonware/services/bdStorage.cpp +++ b/src/client/game/demonware/services/bdStorage.cpp @@ -13,9 +13,9 @@ namespace demonware { this->register_task(20, &bdStorage::list_publisher_files); this->register_task(21, &bdStorage::get_publisher_file); - //this->register_task(10, &bdStorage::set_user_file); + this->register_task(24, &bdStorage::set_user_file); this->register_task(16, &bdStorage::get_user_file); - this->register_task(13, &bdStorage::unk13); + this->register_task(12, &bdStorage::unk12); this->map_publisher_resource("motd-.*\\.txt", DW_MOTD); this->map_publisher_resource("ffotd-.*\\.ff", DW_FASTFILE); @@ -190,7 +190,7 @@ namespace demonware } } - void bdStorage::unk13(service_server* server, byte_buffer* buffer) const + void bdStorage::unk12(service_server* server, byte_buffer* buffer) const { // TODO: auto reply = server->create_reply(this->task_id()); diff --git a/src/client/game/demonware/services/bdStorage.hpp b/src/client/game/demonware/services/bdStorage.hpp index 05beff67..88382538 100644 --- a/src/client/game/demonware/services/bdStorage.hpp +++ b/src/client/game/demonware/services/bdStorage.hpp @@ -20,7 +20,7 @@ namespace demonware void get_publisher_file(service_server* server, byte_buffer* buffer); void set_user_file(service_server* server, byte_buffer* buffer) const; void get_user_file(service_server* server, byte_buffer* buffer) const; - void unk13(service_server* server, byte_buffer* buffer) const; + void unk12(service_server* server, byte_buffer* buffer) const; static std::string get_user_file_path(const std::string& name); }; diff --git a/src/client/game/demonware/services/bdUNK80.cpp b/src/client/game/demonware/services/bdUNK80.cpp index 15281dc6..7478d3f5 100644 --- a/src/client/game/demonware/services/bdUNK80.cpp +++ b/src/client/game/demonware/services/bdUNK80.cpp @@ -11,6 +11,7 @@ namespace demonware this->register_task(130, &bdUNK80::unk130); this->register_task(165, &bdUNK80::unk165); this->register_task(193, &bdUNK80::unk193); + this->register_task(232, &bdUNK80::unk232); } void bdUNK80::unk42(service_server* server, byte_buffer* /*buffer*/) const @@ -54,4 +55,11 @@ namespace demonware auto reply = server->create_reply(this->task_id()); reply->send(); } + + void bdUNK80::unk232(service_server* server, byte_buffer* /*buffer*/) const + { + // TODO: + auto reply = server->create_reply(this->task_id()); + reply->send(); + } } diff --git a/src/client/game/demonware/services/bdUNK80.hpp b/src/client/game/demonware/services/bdUNK80.hpp index 3d4026e2..2870de13 100644 --- a/src/client/game/demonware/services/bdUNK80.hpp +++ b/src/client/game/demonware/services/bdUNK80.hpp @@ -14,5 +14,6 @@ namespace demonware void unk130(service_server* server, byte_buffer* buffer) const; void unk165(service_server* server, byte_buffer* buffer) const; void unk193(service_server* server, byte_buffer* buffer) const; + void unk232(service_server* server, byte_buffer* buffer) const; }; }