normalize includes: common

common/net/console_server.cpp

@@ -1,7 +1,8 @@
 #include "console_server.h"
-#include "../strings.h"
-#include <fmt/format.h>
-#include <fmt/ranges.h>
+
+#include "common/strings.h"
+
+#include "fmt/format.h"
 
 EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 {

common/net/console_server.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "console_server_connection.h"
+
 #include <functional>
 #include <vector>
 

common/net/console_server_connection.cpp

@@ -1,11 +1,12 @@
-#include "console_server.h"
-#include "../util/uuid.h"
-#include "../net/packet.h"
-#include "../eqemu_logsys.h"
-#include "../servertalk.h"
-#include "../rulesys.h"
-#include <fmt/format.h>
-#include <fmt/ranges.h>
+#include "console_server_connection.h"
+
+#include "common/util/uuid.h"
+#include "common/net/console_server.h"
+#include "common/net/packet.h"
+#include "common/servertalk.h"
+#include "common/rulesys.h"
+
+#include "fmt/format.h"
 
 EQ::Net::ConsoleServerConnection::ConsoleServerConnection(ConsoleServer *parent, std::shared_ptr<TCPConnection> connection)
 {

common/net/console_server_connection.h

@@ -1,8 +1,9 @@
 #pragma once
 
 #include "tcp_server.h"
-#include <memory>
+
 #include <map>
+#include <memory>
 
 struct ServerChannelMessage_Struct;
 

common/net/crc32.cpp

@@ -1,5 +1,4 @@
 #include "crc32.h"
-#include <memory.h>
 
 unsigned int CRC32EncodeTable[256] =
 {

common/net/crc32.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#include <stdint.h>
-
 namespace EQ
 {
 	int Crc32(const void *data, int size);
 	int Crc32(const void *data, int size, int key);
-}
+}

common/net/dns.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "../event/event_loop.h"
-#include <string>
+#include "common/event/event_loop.h"
+
 #include <functional>
+#include <string>
 
 namespace EQ
 {

common/net/endian.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cstdint>
 #include <algorithm>
+#include <cstdint>
 #include <type_traits>
 
 namespace EQ

common/net/eqstream.cpp

@@ -1,5 +1,6 @@
 #include "eqstream.h"
-#include "../eqemu_logsys.h"
+
+#include "common/eqemu_logsys.h"
 
 EQ::Net::EQStreamManager::EQStreamManager(const EQStreamManagerInterfaceOptions &options) : EQStreamManagerInterface(options), m_reliable_stream(options.reliable_stream_options)
 {

common/net/eqstream.h

@@ -1,12 +1,13 @@
 #pragma once
 
-#include "../eq_packet.h"
-#include "../eq_stream_intf.h"
-#include "../opcodemgr.h"
-#include "reliable_stream_connection.h"
-#include <vector>
+#include "common/eq_packet.h"
+#include "common/eq_stream_intf.h"
+#include "common/net/reliable_stream_connection.h"
+#include "common/opcodemgr.h"
+
 #include <deque>
 #include <unordered_map>
+#include <vector>
 
 namespace EQ
 {

common/net/packet.cpp

@@ -1,8 +1,9 @@
 #include "packet.h"
-#include "endian.h"
+
+#include "common/net/endian.h"
+
+#include "fmt/format.h"
 #include <cctype>
-#include <fmt/format.h>
-#include <fmt/ranges.h>
 
 void EQ::Net::Packet::PutInt8(size_t offset, int8_t value)
 {

common/net/packet.h

@@ -1,12 +1,14 @@
 #pragma once
 
+#include "common/util/memory_stream.h"
+
+#include "cereal/archives/binary.hpp"
+#include "cereal/cereal.hpp"
+
 #include <cstdint>
-#include <string>
-#include <stdexcept>
 #include <cstring>
-#include "../util/memory_stream.h"
-#include <cereal/cereal.hpp>
-#include <cereal/archives/binary.hpp>
+#include <stdexcept>
+#include <string>
 
 namespace EQ {
 	namespace Net {

common/net/reliable_stream_connection.cpp

@@ -1,10 +1,11 @@
 #include "reliable_stream_connection.h"
-#include "../event/event_loop.h"
-#include "../data_verification.h"
-#include "crc32.h"
-#include <zlib.h>
-#include <fmt/format.h>
-#include <fmt/ranges.h>
+
+#include "common/event/event_loop.h"
+#include "common/data_verification.h"
+#include "common/net/crc32.h"
+
+#include "zlib.h"
+#include "fmt/format.h"
 
 // observed client receive window is 300 packets, 140KB
 constexpr size_t MAX_CLIENT_RECV_PACKETS_PER_WINDOW = 300;

common/net/reliable_stream_connection.h

@@ -1,16 +1,18 @@
 #pragma once
 
-#include "../random.h"
-#include "packet.h"
-#include "reliable_stream_structs.h"
-#include "reliable_stream_pooling.h"
-#include <uv.h>
+#include "common/random.h"
+#include "common/net/packet.h"
+#include "common/net/reliable_stream_structs.h"
+#include "common/net/reliable_stream_pooling.h"
+
+#include "uv.h"
+
 #include <chrono>
 #include <functional>
-#include <memory>
-#include <map>
-#include <queue>
 #include <list>
+#include <map>
+#include <memory>
+#include <queue>
 
 namespace EQ
 {

common/net/reliable_stream_pooling.h

@@ -1,14 +1,15 @@
 #pragma once
 
-#include <optional>
+#include "common/eqemu_logsys.h"
+
+#include "uv.h"
+
+#include <array>
 #include <atomic>
 #include <memory>
-#include <array>
-#include <vector>
 #include <mutex>
-#include <iostream>
-#include "../eqemu_logsys.h"
-#include <uv.h>
+#include <optional>
+#include <vector>
 
 constexpr size_t UDP_BUFFER_SIZE = 512;
 

common/net/reliable_stream_structs.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include <cereal/cereal.hpp>
+#include "common/net/endian.h"
+
+#include "cereal/cereal.hpp"
 #include <cstdint>
-#include "endian.h"
 
 namespace EQ
 {

common/net/servertalk_client_connection.cpp

@@ -1,6 +1,7 @@
 #include "servertalk_client_connection.h"
-#include "dns.h"
-#include "../eqemu_logsys.h"
+
+#include "common/eqemu_logsys.h"
+#include "common/net/dns.h"
 
 EQ::Net::ServertalkClient::ServertalkClient(const std::string &addr, int port, bool ipv6, const std::string &identifier, const std::string &credentials)
 	: m_timer(std::make_unique<EQ::Timer>(100, true, std::bind(&EQ::Net::ServertalkClient::Connect, this)))

common/net/servertalk_client_connection.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "tcp_connection.h"
-#include "../event/timer.h"
-#include "servertalk_common.h"
-#include "packet.h"
+#include "common/event/timer.h"
+#include "common/net/packet.h"
+#include "common/net/servertalk_common.h"
+#include "common/net/tcp_connection.h"
 
 namespace EQ
 {

common/net/servertalk_common.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../servertalk.h"
+#include "common/servertalk.h"
 
 namespace EQ
 {

common/net/servertalk_legacy_client_connection.cpp

@@ -1,6 +1,7 @@
 #include "servertalk_legacy_client_connection.h"
-#include "dns.h"
-#include "../eqemu_logsys.h"
+
+#include "common/net/dns.h"
+#include "common/eqemu_logsys.h"
 
 EQ::Net::ServertalkLegacyClient::ServertalkLegacyClient(const std::string &addr, int port, bool ipv6)
 	: m_timer(std::make_unique<EQ::Timer>(100, true, std::bind(&EQ::Net::ServertalkLegacyClient::Connect, this)))

common/net/servertalk_legacy_client_connection.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "tcp_connection.h"
-#include "../event/timer.h"
-#include "servertalk_common.h"
-#include "packet.h"
+#include "common/event/timer.h"
+#include "common/net/tcp_connection.h"
+#include "common/net/packet.h"
+#include "common/net/servertalk_common.h"
 
 namespace EQ
 {

common/net/servertalk_server.h

@@ -1,9 +1,10 @@
 #pragma once
 
-#include "tcp_server.h"
-#include "servertalk_server_connection.h"
-#include <vector>
+#include "common/net/servertalk_server_connection.h"
+#include "common/net/tcp_server.h"
+
 #include <map>
+#include <vector>
 
 namespace EQ
 {

common/net/servertalk_server_connection.cpp

@@ -1,7 +1,8 @@
 #include "servertalk_server_connection.h"
-#include "servertalk_server.h"
-#include "../eqemu_logsys.h"
-#include "../util/uuid.h"
+
+#include "common/eqemu_logsys.h"
+#include "common/net/servertalk_server.h"
+#include "common/util/uuid.h"
 
 EQ::Net::ServertalkServerConnection::ServertalkServerConnection(std::shared_ptr<EQ::Net::TCPConnection> c, EQ::Net::ServertalkServer *parent)
 {

common/net/servertalk_server_connection.h

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "tcp_connection.h"
-#include "servertalk_common.h"
-#include "packet.h"
+#include "common/net/packet.h"
+#include "common/net/servertalk_common.h"
+#include "common/net/tcp_connection.h"
+
 #include <vector>
 
 namespace EQ

common/net/tcp_connection.cpp

@@ -1,5 +1,7 @@
 #include "tcp_connection.h"
-#include "../event/event_loop.h"
+
+#include "common/event/event_loop.h"
+
 #include <iostream>
 
 WriteReqPool tcp_write_pool;

common/net/tcp_connection.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "tcp_connection_pooling.h"
+#include "common/net/tcp_connection_pooling.h"
+
+#include "uv.h"
 #include <functional>
-#include <string>
 #include <memory>
-#include <uv.h>
+#include <string>
 
 namespace EQ
 {

common/net/tcp_connection_pooling.h

@@ -1,14 +1,15 @@
 #pragma once
 
-#include "../eqemu_logsys.h"
-#include <vector>
+#include "common/eqemu_logsys.h"
+
+#include "uv.h"
 #include <array>
 #include <atomic>
-#include <memory>
-#include <optional>
-#include <mutex>
-#include <uv.h>
 #include <iostream>
+#include <memory>
+#include <mutex>
+#include <optional>
+#include <vector>
 
 namespace EQ { namespace Net { class TCPConnection; } }
 

common/net/tcp_server.cpp

@@ -1,5 +1,6 @@
 #include "tcp_server.h"
-#include "../event/event_loop.h"
+
+#include "common/event/event_loop.h"
 
 void on_close_tcp_server_handle(uv_handle_t* handle) {
 	delete (uv_tcp_t *)handle;

common/net/tcp_server.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "tcp_connection.h"
+#include "common/net/tcp_connection.h"
 
 namespace EQ
 {
@@ -22,4 +22,4 @@ namespace EQ
 			uv_tcp_t *m_socket;
 		};
 	}
-}
+}

common/net/websocket_server.cpp

@@ -1,12 +1,13 @@
 #include "websocket_server.h"
-#include "../event/event_loop.h"
-#include "../event/timer.h"
-#include <fmt/format.h>
-#include <fmt/ranges.h>
+
+#include "common/emu_constants.h"
+#include "common/event/event_loop.h"
+#include "common/event/timer.h"
+
+#include "fmt/format.h"
+#include <array>
 #include <map>
 #include <unordered_set>
-#include <array>
-#include "../emu_constants.h"
 
 struct MethodHandlerEntry
 {

common/net/websocket_server.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "websocket_server_connection.h"
+#include "common/json/json.h"
+#include "common/net/websocket_server_connection.h"
 
-#include "../json/json.h"
-#include <memory>
-#include <functional>
 #include <exception>
+#include <functional>
+#include <memory>
 
 namespace EQ
 {

common/net/websocket_server_connection.cpp

@@ -1,10 +1,11 @@
 #include "websocket_server_connection.h"
-#include "websocket_server.h"
-#include "../timer.h"
-#include "../util/uuid.h"
+
+#include "common/net/websocket_server.h"
+#include "common/timer.h"
+#include "common/util/uuid.h"
+
+#include "fmt/format.h"
 #include <sstream>
-#include <fmt/format.h>
-#include <fmt/ranges.h>
 
 struct EQ::Net::WebsocketServerConnection::Impl {
 	WebsocketServer *parent;

common/net/websocket_server_connection.h

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "tcp_server.h"
-#include "../types.h"
-#include "../json/json-forwards.h"
-#include <websocketpp/config/core.hpp>
-#include <websocketpp/server.hpp>
+#include "common/json/json-forwards.h"
+#include "common/net/tcp_server.h"
+#include "common/types.h"
+
+#include "websocketpp/config/core.hpp"
+#include "websocketpp/server.hpp"
 
 namespace EQ
 {