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

[Code] QueryServConnection Global to Singleton Cleanup

Browse Source
This commit is contained in:
Kinglykrab
2025-06-20 22:31:39 -04:00
committed by Chris Miles
parent 004e2ca63f
commit b1ec17b6df
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/eqemu_api_world_data_service.cpp
-1
View File
@@ -16,7 +16,6 @@
extern ZSList zoneserver_list; extern ZSList zoneserver_list;
extern ClientList client_list; extern ClientList client_list;
extern WorldGuildManager guild_mgr; extern WorldGuildManager guild_mgr;
extern QueryServConnection QSLink;
void callGetZoneList(Json::Value &response) void callGetZoneList(Json::Value &response)
{ {
world/main.cpp
+2 -3
View File
@@ -94,7 +94,6 @@
ClientList client_list; ClientList client_list;
GroupLFPList LFPGroupList; GroupLFPList LFPGroupList;
ZSList zoneserver_list; ZSList zoneserver_list;
QueryServConnection QSLink;
LauncherList launcher_list; LauncherList launcher_list;
WorldEventScheduler event_scheduler; WorldEventScheduler event_scheduler;
volatile bool RunLoops = true; volatile bool RunLoops = true;
@@ -269,7 +268,7 @@ int main(int argc, char **argv)
connection->Handle()->RemotePort(), connection->Handle()->RemotePort(),
connection->GetUUID()); connection->GetUUID());
QSLink.AddConnection(connection); QueryServConnection::Instance()->AddConnection(connection);
} }
); );
@@ -280,7 +279,7 @@ int main(int argc, char **argv)
connection->GetUUID() connection->GetUUID()
); );
QSLink.RemoveConnection(connection); QueryServConnection::Instance()->RemoveConnection(connection);
} }
); );
world/queryserv.h
+7
View File
@@ -15,6 +15,13 @@ public:
void HandleGenericMessage(uint16_t opcode, EQ::Net::Packet &p); void HandleGenericMessage(uint16_t opcode, EQ::Net::Packet &p);
void HandleLFGuildUpdateMessage(uint16_t opcode, EQ::Net::Packet &p); void HandleLFGuildUpdateMessage(uint16_t opcode, EQ::Net::Packet &p);
bool SendPacket(ServerPacket* pack); bool SendPacket(ServerPacket* pack);
static QueryServConnection* Instance()
{
static QueryServConnection instance;
return &instance;
}
private: private:
std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams; std::map<std::string, std::shared_ptr<EQ::Net::ServertalkServerConnection>> m_streams;
std::unique_ptr<EQ::Timer> m_keepalive; std::unique_ptr<EQ::Timer> m_keepalive;
world/zoneserver.cpp
+2 -3
View File
@@ -57,7 +57,6 @@ extern GroupLFPList LFPGroupList;
extern ZSList zoneserver_list; extern ZSList zoneserver_list;
extern volatile bool RunLoops; extern volatile bool RunLoops;
extern volatile bool UCSServerAvailable_; extern volatile bool UCSServerAvailable_;
extern QueryServConnection QSLink;
void CatchSignal(int sig_num); void CatchSignal(int sig_num);
@@ -372,7 +371,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
player_event_logs.AddToQueue(n.player_event_log); player_event_logs.AddToQueue(n.player_event_log);
} }
else { else {
QSLink.SendPacket(pack); QueryServConnection::Instance()->SendPacket(pack);
} }
// if discord enabled for event, ship to UCS to process // if discord enabled for event, ship to UCS to process
@@ -1359,7 +1358,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
break; break;
} }
case ServerOP_QueryServGeneric: { case ServerOP_QueryServGeneric: {
QSLink.SendPacket(pack); QueryServConnection::Instance()->SendPacket(pack);
break; break;
} }
case ServerOP_CZDialogueWindow: case ServerOP_CZDialogueWindow: