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

World auth: include realmId in AUTH_SESSION

Browse source
This commit is contained in:
Kelsi 2026-02-13 01:51:49 -08:00
parent 58e1cc47b9
commit 81e082dc46
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/game/game_handler.hpp
View file

@ -134,7 +134,8 @@ public:
uint16_t port,
const std::vector<uint8_t>& sessionKey,
const std::string& accountName,
uint32_t build = 12340);
uint32_t build = 12340,
uint32_t realmId = 0);
/**
* Disconnect from world server
@ -957,6 +958,7 @@ private:
std::vector<uint8_t> sessionKey; // 40-byte session key from auth server
std::string accountName; // Account name
uint32_t build = 12340; // Client build (3.3.5a)
uint32_t realmId_ = 0; // Realm ID from auth REALM_LIST (used in WotLK AUTH_SESSION)
uint32_t clientSeed = 0; // Random seed generated by client
uint32_t serverSeed = 0; // Seed from SMSG_AUTH_CHALLENGE

15
src/core/application.cpp
View file

@ -892,12 +892,25 @@ void Application::setupUICallbacks() {
accountName = "TESTACCOUNT";
}
uint32_t realmId = 0;
{
// WotLK AUTH_SESSION includes a RealmID field; some servers reject if it's wrong/zero.
const auto& realms = authHandler->getRealms();
for (const auto& r : realms) {
if (r.name == realmName && r.address == realmAddress) {
realmId = r.id;
break;
}
}
LOG_INFO("Selected realmId=", realmId);
}
uint32_t clientBuild = 12340; // default WotLK
if (expansionRegistry_) {
auto* profile = expansionRegistry_->getActive();
if (profile) clientBuild = profile->build;
}
if (gameHandler->connect(host, port, sessionKey, accountName, clientBuild)) {
if (gameHandler->connect(host, port, sessionKey, accountName, clientBuild, realmId)) {
LOG_INFO("Connected to world server, transitioning to character selection");
setState(AppState::CHARACTER_SELECTION);
} else {

7
src/game/game_handler.cpp
View file

@ -114,7 +114,8 @@ bool GameHandler::connect(const std::string& host,
uint16_t port,
const std::vector<uint8_t>& sessionKey,
const std::string& accountName,
uint32_t build) {
uint32_t build,
uint32_t realmId) {
if (sessionKey.size() != 40) {
LOG_ERROR("Invalid session key size: ", sessionKey.size(), " (expected 40)");
@ -134,6 +135,7 @@ bool GameHandler::connect(const std::string& host,
this->sessionKey = sessionKey;
this->accountName = accountName;
this->build = build;
this->realmId_ = realmId;
requiresWarden_ = false;
wardenGateSeen_ = false;
wardenGateElapsed_ = 0.0f;
@ -1433,7 +1435,8 @@ void GameHandler::sendAuthSession() {
accountName,
clientSeed,
sessionKey,
serverSeed
serverSeed,
realmId_
);
LOG_DEBUG("CMSG_AUTH_SESSION packet size: ", packet.getSize(), " bytes");