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

normalize includes: queryserv

Browse Source
This commit is contained in:
brainiac 2025-12-17 09:34:27 -08:00 committed by Alex
parent 227553337e
commit 91defcad99
14 changed files with 101 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
queryserv/CMakeLists.txt
View File

@ -26,6 +26,7 @@ install(TARGETS queryserv RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
add_definitions(-DQSERV) add_definitions(-DQSERV)
target_link_libraries(queryserv common) target_link_libraries(queryserv common)
target_include_directories(queryserv PRIVATE ..)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
set_property(TARGET queryserv PROPERTY FOLDER executables/servers) set_property(TARGET queryserv PROPERTY FOLDER executables/servers)

11
queryserv/database.cpp
View File

@ -1,9 +1,12 @@
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h" #include "database.h"
#include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include "common/strings.h"
#include <iostream> #include <iostream>
#include <map> #include <map>
#include "database.h"
#include "../common/strings.h"
// this function does not delete the ServerPacket, so it must be handled at call site // this function does not delete the ServerPacket, so it must be handled at call site
void QSDatabase::GeneralQueryReceive(ServerPacket *pack) void QSDatabase::GeneralQueryReceive(ServerPacket *pack)

27
queryserv/database.h
View File

@ -1,23 +1,20 @@
#ifndef CHATSERVER_DATABASE_H #pragma once
#define CHATSERVER_DATABASE_H
#include "common/database.h"
#include "common/eqemu_logsys.h"
#include "common/global_define.h"
#include "common/linked_list.h"
#include "common/servertalk.h"
#include "common/types.h"
#include <map>
#include <string>
#include <vector>
#define AUTHENTICATION_TIMEOUT 60 #define AUTHENTICATION_TIMEOUT 60
#define INVALID_ID 0xFFFFFFFF #define INVALID_ID 0xFFFFFFFF
#include "../common/eqemu_logsys.h"
#include "../common/global_define.h"
#include "../common/types.h"
#include "../common/database.h"
#include "../common/linked_list.h"
#include "../common/servertalk.h"
#include <string>
#include <vector>
#include <map>
class QSDatabase : public Database { class QSDatabase : public Database {
public: public:
void GeneralQueryReceive(ServerPacket *pack); void GeneralQueryReceive(ServerPacket *pack);
}; };
#endif

9
queryserv/lfguild.cpp
View File

@ -1,8 +1,9 @@
#include "lfguild.h" #include "lfguild.h"
#include "database.h"
#include "worldserver.h" #include "common/rulesys.h"
#include "../common/strings.h" #include "common/strings.h"
#include "../common/rulesys.h" #include "queryserv/database.h"
#include "queryserv/worldserver.h"
extern WorldServer *worldserver; extern WorldServer *worldserver;
extern QSDatabase qs_database; extern QSDatabase qs_database;

10
queryserv/lfguild.h
View File

@ -1,14 +1,13 @@
#ifndef LFGUILD_H #pragma once
#define LFGUILD_H
#include "common/servertalk.h"
#include "common/types.h"
#include <list> #include <list>
#include <string> #include <string>
#include "../common/types.h"
#include "../common/servertalk.h"
class PlayerLookingForGuild class PlayerLookingForGuild
{ {
public: public:
PlayerLookingForGuild(char *Name, char *Comments, uint32 Level, uint32 Class, uint32 AACount, uint32 Timezone, uint32 TimePosted); PlayerLookingForGuild(char *Name, char *Comments, uint32 Level, uint32 Class, uint32 AACount, uint32 Timezone, uint32 TimePosted);
@ -60,4 +59,3 @@ private:
std::list<PlayerLookingForGuild> Players; std::list<PlayerLookingForGuild> Players;
std::list<GuildLookingForPlayers> Guilds; std::list<GuildLookingForPlayers> Guilds;
}; };
#endif /* LFGUILD_H */

38
queryserv/queryserv.cpp
View File

@ -1,25 +1,27 @@
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h" #include "common/crash.h"
#include "../common/opcodemgr.h" #include "common/eqemu_logsys.h"
#include "../common/rulesys.h" #include "common/event/event_loop.h"
#include "../common/platform.h" #include "common/events/player_event_logs.h"
#include "../common/crash.h" #include "common/global_define.h"
#include "../common/strings.h" #include "common/net/console_server.h"
#include "../common/event/event_loop.h" #include "common/net/servertalk_server.h"
#include "../common/timer.h" #include "common/opcodemgr.h"
#include "database.h" #include "common/platform.h"
#include "common/rulesys.h"
#include "common/strings.h"
#include "common/timer.h"
#include "common/zone_store.h"
#include "queryserv/database.h"
#include "queryserv/lfguild.h"
#include "queryserv/worldserver.h"
#include "queryserv/zonelist.h"
#include "queryserv/zoneserver.h"
#include "queryservconfig.h" #include "queryservconfig.h"
#include "lfguild.h"
#include "worldserver.h"
#include "../common/zone_store.h"
#include "../common/events/player_event_logs.h"
#include <list> #include <list>
#include <signal.h> #include <signal.h>
#include <thread> #include <thread>
#include "../common/net/servertalk_server.h"
#include "../common/net/console_server.h"
#include "../queryserv/zonelist.h"
#include "../queryserv/zoneserver.h"
volatile bool RunLoops = true; volatile bool RunLoops = true;

3
queryserv/queryservconfig.cpp
View File

@ -17,9 +17,10 @@
*/ */
#include "../common/global_define.h"
#include "queryservconfig.h" #include "queryservconfig.h"
#include "common/global_define.h"
queryservconfig *queryservconfig::_chat_config = nullptr; queryservconfig *queryservconfig::_chat_config = nullptr;
std::string queryservconfig::GetByName(const std::string &var_name) const { std::string queryservconfig::GetByName(const std::string &var_name) const {

8
queryserv/queryservconfig.h
View File

@ -17,10 +17,9 @@
*/ */
#ifndef __queryservconfig_H #pragma once
#define __queryservconfig_H
#include "../common/eqemu_config.h" #include "common/eqemu_config.h"
class queryservconfig : public EQEmuConfig { class queryservconfig : public EQEmuConfig {
public: public:
@ -50,6 +49,3 @@ public:
} }
}; };
#endif

42
queryserv/worldserver.cpp
View File

@ -1,27 +1,25 @@
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h"
#include "../common/md5.h"
#include "../common/packet_dump.h"
#include "../common/packet_functions.h"
#include "../common/servertalk.h"
#include "../common/net/packet.h"
#include "database.h"
#include "lfguild.h"
#include "queryservconfig.h"
#include "worldserver.h" #include "worldserver.h"
#include "../common/events/player_events.h"
#include "../common/events/player_event_logs.h"
#include "../common/server_reload_types.h"
#include <iomanip>
#include <iostream>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "zonelist.h" #include "common/eqemu_logsys.h"
#include "common/events/player_event_logs.h"
#include "common/events/player_events.h"
#include "common/global_define.h"
#include "common/md5.h"
#include "common/net/packet.h"
#include "common/packet_dump.h"
#include "common/packet_functions.h"
#include "common/server_reload_types.h"
#include "common/servertalk.h"
#include "queryserv/database.h"
#include "queryserv/lfguild.h"
#include "queryserv/queryservconfig.h"
#include "queryserv/zonelist.h"
#include <cstdarg>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctime>
extern WorldServer worldserver; extern WorldServer worldserver;
extern const queryservconfig *Config; extern const queryservconfig *Config;

11
queryserv/worldserver.h
View File

@ -15,12 +15,13 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef WORLDSERVER_H
#define WORLDSERVER_H #pragma once
#include "common/eq_packet_structs.h"
#include "common/net/servertalk_client_connection.h"
#include <mutex> #include <mutex>
#include "../common/eq_packet_structs.h"
#include "../common/net/servertalk_client_connection.h"
class WorldServer { class WorldServer {
public: public:
@ -38,5 +39,3 @@ private:
std::unique_ptr<EQ::Net::ServertalkClient> m_connection; std::unique_ptr<EQ::Net::ServertalkClient> m_connection;
}; };
#endif

5
queryserv/zonelist.cpp
View File

@ -1,6 +1,7 @@
#include "zonelist.h" #include "zonelist.h"
#include "zoneserver.h"
#include "../common/strings.h" #include "queryserv/zoneserver.h"
#include "common/strings.h"
void ZSList::Add(ZoneServer* zoneserver) { void ZSList::Add(ZoneServer* zoneserver) {
zone_server_list.emplace_back(std::unique_ptr<ZoneServer>(zoneserver)); zone_server_list.emplace_back(std::unique_ptr<ZoneServer>(zoneserver));

14
queryserv/zonelist.h
View File

@ -1,12 +1,12 @@
#ifndef ZONELIST_H_ #pragma once
#define ZONELIST_H_
#include "../common/types.h" #include "common/types.h"
#include "queryserv/zoneserver.h"
#include <list>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <memory>
#include <list>
#include "zoneserver.h"
class WorldTCPConnection; class WorldTCPConnection;
@ -26,5 +26,3 @@ public:
private: private:
std::list<std::unique_ptr<ZoneServer>> zone_server_list; std::list<std::unique_ptr<ZoneServer>> zone_server_list;
}; };
#endif /*ZONELIST_H_*/

11
queryserv/zoneserver.cpp
View File

@ -1,9 +1,10 @@
#include "zoneserver.h" #include "zoneserver.h"
#include "../common/global_define.h"
#include "../common/eqemu_logsys.h" #include "common/discord/discord_manager.h"
#include "../common/repositories/player_event_logs_repository.h" #include "common/eqemu_logsys.h"
#include "../common/events/player_event_logs.h" #include "common/events/player_event_logs.h"
#include "../common/discord/discord_manager.h" #include "common/global_define.h"
#include "common/repositories/player_event_logs_repository.h"
ZoneServer::ZoneServer( ZoneServer::ZoneServer(
std::shared_ptr<EQ::Net::ServertalkServerConnection> in_connection, std::shared_ptr<EQ::Net::ServertalkServerConnection> in_connection,

19
queryserv/zoneserver.h
View File

@ -1,12 +1,12 @@
#ifndef ZONESERVER_H #pragma once
#define ZONESERVER_H
#include "common/emu_constants.h"
#include "common/event/timer.h"
#include "common/net/servertalk_server.h"
#include "common/timer.h"
#include "world/console.h"
#include "world/world_tcp_connection.h"
#include "../world/world_tcp_connection.h"
#include "../common/net/servertalk_server.h"
#include "../common/event/timer.h"
#include "../common/timer.h"
#include "../common/emu_constants.h"
#include "../world/console.h"
#include <string> #include <string>
class Client; class Client;
@ -28,6 +28,3 @@ private:
bool m_is_zone_connected = false; bool m_is_zone_connected = false;
EQ::Net::ConsoleServer *m_console; EQ::Net::ConsoleServer *m_console;
}; };
#endif