pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-16 09:48:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code Cleanup] More login <-> world code cleanup (#4724)

Browse Source 
* More cleanup

* More cleanup
This commit is contained in:
Chris Miles
2025-02-28 16:08:06 -06:00
committed by GitHub
parent cb634cf57d
commit eb6ac25540
13 changed files with 412 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files
loginserver/world_server.cpp
+7 -7
View File
@@ -143,7 +143,7 @@ void WorldServer::ProcessUserToWorldResponseLegacy(uint16_t opcode, const EQ::Ne
packet.ToString()
);
if (packet.Length() < sizeof(UsertoWorldResponseLegacy_Struct)) {
if (packet.Length() < sizeof(UsertoWorldResponseLegacy)) {
LogError(
"Received application packet from server that had opcode ServerOP_UsertoWorldResp, "
"but was too small. Discarded to avoid buffer overrun"
@@ -152,7 +152,7 @@ void WorldServer::ProcessUserToWorldResponseLegacy(uint16_t opcode, const EQ::Ne
return;
}
auto *res = (UsertoWorldResponseLegacy_Struct *) packet.Data();
auto *res = (UsertoWorldResponseLegacy *) packet.Data();
LogDebug("Trying to find client with user id of [{}]", res->lsaccountid);
Client *c = server.client_manager->GetClient(res->lsaccountid, "eqemu");
@@ -229,7 +229,7 @@ void WorldServer::ProcessUserToWorldResponse(uint16_t opcode, const EQ::Net::Pac
packet.ToString()
);
if (packet.Length() < sizeof(UsertoWorldResponse_Struct)) {
if (packet.Length() < sizeof(UsertoWorldResponse)) {
LogError(
"Received application packet from server that had opcode ServerOP_UsertoWorldResp, "
"but was too small. Discarded to avoid buffer overrun"
@@ -238,7 +238,7 @@ void WorldServer::ProcessUserToWorldResponse(uint16_t opcode, const EQ::Net::Pac
return;
}
auto res = (UsertoWorldResponse_Struct *) packet.Data();
auto res = (UsertoWorldResponse *) packet.Data();
LogDebug("Trying to find client with user id of [{}]", res->lsaccountid);
Client *c = server.client_manager->GetClient(
@@ -494,7 +494,7 @@ void WorldServer::HandleWorldserverStatusUpdate(LoginserverWorldStatusUpdate *u)
void WorldServer::SendClientAuthToWorld(Client *c)
{
EQ::Net::DynamicPacket outapp;
ClientAuth_Struct a{};
ClientAuth a{};
a.loginserver_account_id = c->GetAccountID();
@@ -503,7 +503,7 @@ void WorldServer::SendClientAuthToWorld(Client *c)
a.lsadmin = 0;
a.is_world_admin = 0;
a.ip = inet_addr(c->GetConnection()->GetRemoteAddr().c_str());
a.ip_address = inet_addr(c->GetConnection()->GetRemoteAddr().c_str());
strncpy(a.loginserver_name, &c->GetLoginServerName()[0], 64);
const std::string &client_address(c->GetConnection()->GetRemoteAddr());
@@ -521,7 +521,7 @@ void WorldServer::SendClientAuthToWorld(Client *c)
}
struct in_addr ip_addr{};
ip_addr.s_addr = a.ip;
ip_addr.s_addr = a.ip_address;
LogInfo(
"Client authentication response: world_address [{}] client_address [{}]",