incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve proxy compatibility on GC NTE

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-25 19:05:56 -08:00
parent d1022e9b53
commit dfc451e86a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ProxyCommands.cc
+7 -3
View File
@@ -311,7 +311,9 @@ static HandlerResult S_V123P_02_17(
cmd.sub_version = ses->sub_version; cmd.sub_version = ses->sub_version;
cmd.serial_number.encode(string_printf("%08" PRIX32 "", ses->license->serial_number)); cmd.serial_number.encode(string_printf("%08" PRIX32 "", ses->license->serial_number));
cmd.access_key.encode(ses->license->access_key); cmd.access_key.encode(ses->license->access_key);
cmd.access_key.clear_after_bytes(8); if (ses->version() != Version::GC_NTE) {
cmd.access_key.clear_after_bytes(8);
}
cmd.serial_number2 = cmd.serial_number; cmd.serial_number2 = cmd.serial_number;
cmd.access_key2 = cmd.access_key; cmd.access_key2 = cmd.access_key;
// TODO: We probably should set email_address, but we currently don't // TODO: We probably should set email_address, but we currently don't
@@ -335,7 +337,9 @@ static HandlerResult S_V123P_02_17(
cmd.language = ses->language(); cmd.language = ses->language();
cmd.serial_number.encode(string_printf("%08" PRIX32 "", ses->license->serial_number)); cmd.serial_number.encode(string_printf("%08" PRIX32 "", ses->license->serial_number));
cmd.access_key.encode(ses->license->access_key); cmd.access_key.encode(ses->license->access_key);
cmd.access_key.clear_after_bytes(8); if (ses->version() != Version::GC_NTE) {
cmd.access_key.clear_after_bytes(8);
}
cmd.serial_number2 = cmd.serial_number; cmd.serial_number2 = cmd.serial_number;
cmd.access_key2 = cmd.access_key; cmd.access_key2 = cmd.access_key;
if (ses->config.check_flag(Client::Flag::PROXY_BLANK_NAME_ENABLED)) { if (ses->config.check_flag(Client::Flag::PROXY_BLANK_NAME_ENABLED)) {
@@ -1450,7 +1454,7 @@ static HandlerResult S_64(shared_ptr<ProxyServer::LinkedSession> ses, uint16_t,
// use it here, so we allow it to be omitted. // use it here, so we allow it to be omitted.
cmd = &check_size_t<CmdT>(data.data(), data.size(), sizeof(CmdT) - 0x18, sizeof(CmdT)); cmd = &check_size_t<CmdT>(data.data(), data.size(), sizeof(CmdT) - 0x18, sizeof(CmdT));
} else { } else {
cmd = &check_size_t<CmdT>(data); cmd = &check_size_t<CmdT>(data, 0xFFFF);
} }
ses->clear_lobby_players(4); ses->clear_lobby_players(4);