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

[Player Events] Zone Fetch Settings from QS if Enabled (#4915)

Browse Source 
* [Player Events] Zone Fetch Settings from QS if Enabled

* Update zonelist.cpp

* Update zoneserver.cpp
This commit is contained in:
Chris Miles
2025-06-25 12:21:35 -05:00
committed by GitHub
parent f025e5741b
commit fb4d003e19
13 changed files with 151 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/queryserv.cpp
+58 -10
View File
@@ -1,12 +1,13 @@
#include "../common/global_define.h"
#include "../common/servertalk.h"
#include "../common/strings.h"
#include "../common/events/player_event_logs.h"
#include "queryserv.h"
#include "worldserver.h"
extern WorldServer worldserver;
extern QueryServ *QServ;
extern QueryServ* QServ;
QueryServ::QueryServ()
{
@@ -20,18 +21,29 @@ void QueryServ::SendQuery(std::string Query)
{
auto pack = new ServerPacket(ServerOP_QSSendQuery, Query.length() + 5);
pack->WriteUInt32(Query.length()); /* Pack Query String Size so it can be dynamically broken out at queryserv */
pack->WriteString(Query.c_str()); /* Query */
pack->WriteString(Query.c_str()); /* Query */
worldserver.SendPacket(pack);
safe_delete(pack);
}
void QueryServ::Connect()
{
m_connection = std::make_unique<EQ::Net::ServertalkClient>(Config->QSHost, Config->QSPort, false, "Zone", Config->SharedKey);
m_connection = std::make_unique<EQ::Net::ServertalkClient>(
Config->QSHost,
Config->QSPort,
false,
"Zone",
Config->SharedKey
);
m_connection->OnMessage(std::bind(&QueryServ::HandleMessage, this, std::placeholders::_1, std::placeholders::_2));
m_connection->OnConnect([this](EQ::Net::ServertalkClient *client) {
m_connection->OnConnect([this](EQ::Net::ServertalkClient* client)
{
m_is_qs_connected = true;
LogInfo("Query Server connection established to [{}] [{}]", client->Handle()->RemoteIP(), client->Handle()->RemotePort());
LogInfo(
"Query Server connection established to [{}] [{}]",
client->Handle()->RemoteIP(),
client->Handle()->RemotePort()
);
});
LogInfo(
@@ -41,7 +53,7 @@ void QueryServ::Connect()
);
}
bool QueryServ::SendPacket(ServerPacket *pack)
bool QueryServ::SendPacket(ServerPacket* pack)
{
if (m_connection.get() == nullptr) {
Connect();
@@ -59,14 +71,50 @@ bool QueryServ::SendPacket(ServerPacket *pack)
return false;
}
void QueryServ::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
void QueryServ::HandleMessage(uint16 opcode, const EQ::Net::Packet& p)
{
ServerPacket tpack(opcode, p);
auto pack = &tpack;
auto pack = &tpack;
switch (opcode) {
default: {
LogInfo("Unknown ServerOP Received <red>[{}]", opcode);
case ServerOP_SendPlayerEventSettings:
{
if (pack->size < sizeof(ServerSendPlayerEvent_Struct)) {
LogError("ServerOP_SendPlayerEventSettings: packet too small");
break;
}
auto* data = reinterpret_cast<const ServerSendPlayerEvent_Struct*>(pack->pBuffer);
const uint32_t expected_size = sizeof(ServerSendPlayerEvent_Struct) + data->cereal_size;
if (pack->size < expected_size) {
LogError(
"ServerOP_SendPlayerEventSettings: packet size mismatch, expected {}, got {}", expected_size,
pack->size
);
break;
}
std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> settings;
try {
EQ::Util::MemoryStreamReader ms(const_cast<char*>(data->cereal_data), data->cereal_size);
cereal::BinaryInputArchive ar(ms);
ar(settings);
}
catch (const std::exception& ex) {
LogError("Failed to deserialize PlayerEventLogSettings: {}", ex.what());
break;
}
player_event_logs.LoadPlayerEventSettingsFromQS(settings);
LogInfo("Loaded {} PlayerEventLogSettings from queryserv", settings.size());
break;
}
default:
{
LogInfo("Unknown ServerOP Received [{}]", opcode);
break;
}
}