thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 03:02:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(net): use LoginResponse::UpdateLoginStatus across GruntLogin

Browse source
This commit is contained in:
fallenoak 2023-02-07 17:17:31 -06:00
parent 153b25ede9
commit 0f93736390
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
1 changed files with 23 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/net/login/GruntLogin.cpp
View file

@ -20,16 +20,12 @@ bool GruntLogin::Connected(const NETADDR& addr) {
// TODO // TODO
// OsNetAddrToStr(addr, addrStr, sizeof(addrStr)); // OsNetAddrToStr(addr, addrStr, sizeof(addrStr));
char stateStr[64]; this->m_loginResponse->UpdateLoginStatus(
// TODO LOGIN_STATE_15,
// SStrCopy(stateStr, g_LoginStateStringNames[LOGIN_STATE_15], sizeof(stateStr)); LOGIN_OK,
addrStr,
char resultStr[64]; 0x0
// TODO );
// SStrCopy(resultStr, g_LoginResultStringNames[LOGIN_OK], sizeof(resultStr));
// TODO
this->m_loginResponse->LoginServerStatus(LOGIN_STATE_15, LOGIN_OK, addrStr, stateStr, resultStr, 0);
return true; return true;
} }
@ -58,24 +54,11 @@ void GruntLogin::GetLogonMethod() {
if (this->IsReconnect()) { if (this->IsReconnect()) {
// TODO // TODO
} else if (this->m_password) { } else if (this->m_password) {
this->m_loginResponse->m_loginState = LOGIN_STATE_AUTHENTICATING; this->m_loginResponse->UpdateLoginStatus(
this->m_loginResponse->m_loginResult = LOGIN_OK;
char stateStr[64];
// TODO
// SStrCopy(stateStr, g_LoginStateStringNames[LOGIN_STATE_AUTHENTICATING], sizeof(stateStr));
char resultStr[64];
// TODO
// SStrCopy(resultStr, g_LoginResultStringNames[LOGIN_OK], sizeof(resultStr));
this->m_loginResponse->LoginServerStatus(
LOGIN_STATE_AUTHENTICATING, LOGIN_STATE_AUTHENTICATING,
LOGIN_OK, LOGIN_OK,
nullptr, nullptr,
stateStr, 0x0
resultStr,
0
); );
logon.password = this->m_password; logon.password = this->m_password;
@ -104,7 +87,13 @@ void GruntLogin::GetVersionProof(const uint8_t* versionChallenge) {
} else { } else {
memcpy(this->m_versionChallenge, versionChallenge, sizeof(this->m_versionChallenge)); memcpy(this->m_versionChallenge, versionChallenge, sizeof(this->m_versionChallenge));
LOGIN_STATE nextState = this->NextSecurityState(LOGIN_STATE_FIRST_SECURITY); LOGIN_STATE nextState = this->NextSecurityState(LOGIN_STATE_FIRST_SECURITY);
this->m_loginResponse->UpdateLoginStatus(nextState, LOGIN_OK, nullptr, 0);
this->m_loginResponse->UpdateLoginStatus(
nextState,
LOGIN_OK,
nullptr,
0x0
);
} }
} }
@ -129,14 +118,12 @@ void GruntLogin::Logon(const char* a2, const char* a3) {
// TODO // TODO
this->m_loginResponse->m_loginState = LOGIN_STATE_CONNECTING; this->m_loginResponse->UpdateLoginStatus(
this->m_loginResponse->m_loginResult = LOGIN_OK; LOGIN_STATE_CONNECTING,
LOGIN_OK,
// TODO nullptr,
// char v6[64], v7[64]; 0x0
// SStrCopy(v6, g_LoginStateStringNames[1], sizeof(v6)); );
// SStrCopy(v7, g_LoginResultStringNames[0], sizeof(v7));
// this->m_loginResponse->Vfunc6(1, 0, 0, v6, v7, 0);
if (!a2) { if (!a2) {
a2 = "us.logon.worldofwarcraft.com:3724"; a2 = "us.logon.worldofwarcraft.com:3724";
@ -202,22 +189,11 @@ void GruntLogin::ProveVersion(const uint8_t* versionChecksum) {
this->m_clientLink->ProveVersion(versionChecksum); this->m_clientLink->ProveVersion(versionChecksum);
this->m_loginResponse->m_loginState = LOGIN_STATE_HANDSHAKING; this->m_loginResponse->UpdateLoginStatus(
this->m_loginResponse->m_loginResult = LOGIN_OK;
char stateStr[64];
SStrCopy(stateStr, Grunt::g_LoginStateStringNames[LOGIN_STATE_HANDSHAKING], sizeof(stateStr));
char resultStr[64];
SStrCopy(resultStr, Grunt::g_LoginResultStringNames[LOGIN_OK], sizeof(resultStr));
this->m_loginResponse->LoginServerStatus(
LOGIN_STATE_HANDSHAKING, LOGIN_STATE_HANDSHAKING,
LOGIN_OK, LOGIN_OK,
nullptr, nullptr,
stateStr, 0x0
resultStr,
0
); );
} }