phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-22 23:30:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow per-expansion login header fields + fix challenge FourCC encoding

Browse source
This commit is contained in:
Kelsi 2026-02-13 00:48:56 -08:00
parent 58ad69d939
commit fd468ce793
5 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Data/expansions/turtle/expansion.json
View file

@ -5,6 +5,7 @@
"version": { "major": 1, "minor": 12, "patch": 1 },
"build": 5875,
"protocolVersion": 8,
"locale": "enGB",
"maxLevel": 60,
"races": [1, 2, 3, 4, 5, 6, 7, 8],
"classes": [1, 2, 3, 4, 5, 7, 8, 9, 11]

7
include/game/expansion_profile.hpp
View file

@ -21,6 +21,13 @@ struct ExpansionProfile {
uint8_t patchVersion = 0;
uint16_t build = 0;
uint8_t protocolVersion = 0; // SRP auth protocol version byte
// Client header fields used in LOGON_CHALLENGE.
// Defaults match a typical Windows x86 client.
std::string game = "WoW";
std::string platform = "x86";
std::string os = "Win";
std::string locale = "enUS";
uint32_t timezone = 0;
std::string dataPath; // Absolute path to expansion data dir
uint32_t maxLevel = 60;
std::vector<uint32_t> races;

21
src/auth/auth_packets.cpp
View file

@ -25,14 +25,13 @@ network::Packet LogonChallengePacket::build(const std::string& account, const Cl
// Payload size
packet.writeUInt16(payloadSize);
// Write a FourCC-like 4-byte ASCII field in the legacy login wire format:
// reverse the characters and null-pad to 4 bytes.
// Example (1.12.1): platform "x86" is sent as bytes "68x\\0"; os "Win" as "niW\\0"; locale "enGB" as "BGne".
auto writeFourCCLE = [&packet](const std::string& str) {
// Write a 4-byte ASCII field (FourCC-ish): bytes are sent in-order and null-padded.
// Auth servers expect literal "x86\\0", "Win\\0", "enUS"/"enGB", etc.
auto writeFourCC = [&packet](const std::string& str) {
uint8_t buf[4] = {0, 0, 0, 0};
size_t len = std::min<size_t>(4, str.length());
for (size_t i = 0; i < len; ++i) {
buf[i] = static_cast<uint8_t>(str[len - 1 - i]);
buf[i] = static_cast<uint8_t>(str[i]);
}
for (int i = 0; i < 4; ++i) {
packet.writeUInt8(buf[i]);
@ -59,14 +58,14 @@ network::Packet LogonChallengePacket::build(const std::string& account, const Cl
// Build (2 bytes)
packet.writeUInt16(info.build);
// Platform (4 bytes, legacy reversed encoding)
writeFourCCLE(info.platform);
// Platform (4 bytes)
writeFourCC(info.platform);
// OS (4 bytes, legacy reversed encoding)
writeFourCCLE(info.os);
// OS (4 bytes)
writeFourCC(info.os);
// Locale (4 bytes, legacy reversed encoding)
writeFourCCLE(info.locale);
// Locale (4 bytes)
writeFourCC(info.locale);
// Timezone
packet.writeUInt32(info.timezone);

9
src/game/expansion_profile.cpp
View file

@ -166,6 +166,15 @@ bool ExpansionRegistry::loadProfile(const std::string& jsonPath, const std::stri
p.build = static_cast<uint16_t>(jsonInt(json, "build"));
p.protocolVersion = static_cast<uint8_t>(jsonInt(json, "protocolVersion"));
// Optional client header fields (LOGON_CHALLENGE)
{
std::string v;
v = jsonValue(json, "game"); if (!v.empty()) p.game = v;
v = jsonValue(json, "platform"); if (!v.empty()) p.platform = v;
v = jsonValue(json, "os"); if (!v.empty()) p.os = v;
v = jsonValue(json, "locale"); if (!v.empty()) p.locale = v;
p.timezone = static_cast<uint32_t>(jsonInt(json, "timezone", static_cast<int>(p.timezone)));
}
p.maxLevel = static_cast<uint32_t>(jsonInt(json, "maxLevel", 60));
p.races = jsonUintArray(json, "races");
p.classes = jsonUintArray(json, "classes");

5
src/ui/auth_screen.cpp
View file

@ -509,6 +509,11 @@ void AuthScreen::attemptAuth(auth::AuthHandler& authHandler) {
info.patchVersion = profile->patchVersion;
info.build = profile->build;
info.protocolVersion = profile->protocolVersion;
info.game = profile->game;
info.platform = profile->platform;
info.os = profile->os;
info.locale = profile->locale;
info.timezone = profile->timezone;
authHandler.setClientInfo(info);
}
}