From 59df65fa21f0c7a99d8ef07c08e58d6fbee00194 Mon Sep 17 00:00:00 2001 From: KimLS Date: Mon, 12 Sep 2016 19:48:48 -0700 Subject: [PATCH] GCC compile fixes --- common/eq_stream.cpp | 1 - common/net/daybreak_connection.cpp | 15 ++++++++------- common/net/daybreak_connection.h | 6 +++--- common/net/daybreak_structs.h | 2 -- common/net/eqstream.cpp | 2 +- common/net/eqstream.h | 6 +++--- loginserver/client_manager.cpp | 2 +- loginserver/client_manager.h | 2 +- ucs/clientlist.cpp | 2 +- ucs/clientlist.h | 2 +- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp index ac5905930..5a272e201 100644 --- a/common/eq_stream.cpp +++ b/common/eq_stream.cpp @@ -41,7 +41,6 @@ #include #include #include -#include "net\eqstream.h" #endif //for logsys diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp index 9edac9aae..90278160c 100644 --- a/common/net/daybreak_connection.cpp +++ b/common/net/daybreak_connection.cpp @@ -57,7 +57,7 @@ void EQ::Net::DaybreakConnectionManager::Attach(uv_loop_t *loop) rc = uv_udp_recv_start(&m_socket, [](uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { buf->base = new char[suggested_size]; - buf->len = (ULONG)suggested_size; + buf->len = suggested_size; }, [](uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf, const struct sockaddr* addr, unsigned flags) { DaybreakConnectionManager *c = (DaybreakConnectionManager*)handle->data; @@ -82,7 +82,7 @@ void EQ::Net::DaybreakConnectionManager::Detach() if (m_attached) { uv_udp_recv_stop(&m_socket); uv_timer_stop(&m_timer); - m_attached = false; + m_attached = nullptr; } } @@ -201,7 +201,8 @@ void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoi std::shared_ptr EQ::Net::DaybreakConnectionManager::FindConnectionByEndpoint(std::string addr, int port) { - auto &iter = m_connections.find(std::make_pair(addr, port)); + auto p = std::make_pair(addr, port); + auto &iter = m_connections.find(p); if (iter != m_connections.end()) { return iter->second; } @@ -224,7 +225,7 @@ void EQ::Net::DaybreakConnectionManager::SendSessionLost(const std::string &addr uv_buf_t send_buffers[1]; send_buffers[0].base = (char*)out.Data(); - send_buffers[0].len = (ULONG)out.Length(); + send_buffers[0].len = out.Length(); int ret = uv_udp_send(send_req, &m_socket, send_buffers, 1, (sockaddr*)&send_addr, [](uv_udp_send_t* req, int status) { @@ -436,7 +437,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac } } -void EQ::Net::DaybreakConnection::ProcessDecodedPacket(Packet &p) +void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p) { if (p.GetInt8(0) == 0) { if (p.Length() < 2) { @@ -1078,7 +1079,7 @@ void EQ::Net::DaybreakConnection::InternalSend(Packet &p) uv_buf_t send_buffers[1]; send_buffers[0].base = (char*)out.Data(); - send_buffers[0].len = (ULONG)out.Length(); + send_buffers[0].len = out.Length(); uv_udp_send(send_req, &m_owner->m_socket, send_buffers, 1, (sockaddr*)&send_addr, send_func); m_stats.sent_bytes += out.Length(); @@ -1092,7 +1093,7 @@ void EQ::Net::DaybreakConnection::InternalSend(Packet &p) uv_buf_t send_buffers[1]; send_buffers[0].base = (char*)p.Data(); - send_buffers[0].len = (ULONG)p.Length(); + send_buffers[0].len = p.Length(); uv_udp_send(send_req, &m_owner->m_socket, send_buffers, 1, (sockaddr*)&send_addr, send_func); m_stats.sent_bytes += p.Length(); diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h index 010d89e45..24fd41ce1 100644 --- a/common/net/daybreak_connection.h +++ b/common/net/daybreak_connection.h @@ -173,7 +173,7 @@ namespace EQ void ProcessQueue(); void RemoveFromQueue(int stream, uint16_t seq); void AddToQueue(int stream, uint16_t seq, const Packet &p); - void ProcessDecodedPacket(Packet &p); + void ProcessDecodedPacket(const Packet &p); void ChangeStatus(DbProtocolStatus new_status); bool ValidateCRC(Packet &p); void AppendCRC(Packet &p); @@ -245,7 +245,7 @@ namespace EQ void ProcessResend(); void OnNewConnection(std::function)> func) { m_on_new_connection = func; } void OnConnectionStateChange(std::function, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; } - void OnPacketRecv(std::function, Packet &)> func) { m_on_packet_recv = func; } + void OnPacketRecv(std::function, const Packet &)> func) { m_on_packet_recv = func; } private: void Attach(uv_loop_t *loop); void Detach(); @@ -258,7 +258,7 @@ namespace EQ DaybreakConnectionManagerOptions m_options; std::function)> m_on_new_connection; std::function, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change; - std::function, Packet&)> m_on_packet_recv; + std::function, const Packet&)> m_on_packet_recv; std::map, std::shared_ptr> m_connections; void ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size); diff --git a/common/net/daybreak_structs.h b/common/net/daybreak_structs.h index 48452ff89..eb3cba744 100644 --- a/common/net/daybreak_structs.h +++ b/common/net/daybreak_structs.h @@ -167,8 +167,6 @@ namespace EQ CEREAL_NVP(our_timestamp), CEREAL_NVP(client_sent), CEREAL_NVP(client_recv), - CEREAL_NVP(max_ping), - CEREAL_NVP(last_ping), CEREAL_NVP(server_sent), CEREAL_NVP(server_recv)); } diff --git a/common/net/eqstream.cpp b/common/net/eqstream.cpp index 7b16ec331..1419a806f 100644 --- a/common/net/eqstream.cpp +++ b/common/net/eqstream.cpp @@ -37,7 +37,7 @@ void EQ::Net::EQStreamManager::DaybreakConnectionStateChange(std::shared_ptr connection, Packet &p) +void EQ::Net::EQStreamManager::DaybreakPacketRecv(std::shared_ptr connection, const Packet &p) { auto iter = m_streams.find(connection); if (iter != m_streams.end()) { diff --git a/common/net/eqstream.h b/common/net/eqstream.h index 0b51fc53d..7a30b1fae 100644 --- a/common/net/eqstream.h +++ b/common/net/eqstream.h @@ -42,7 +42,7 @@ namespace EQ void OnNewConnection(std::function)> func) { m_on_new_connection = func; } void OnConnectionStateChange(std::function, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; } - void OnPacketRecv(std::function, EmuOpcode, Packet &)> func) { m_on_packet_recv = func; } + void OnPacketRecv(std::function, EmuOpcode, const Packet &)> func) { m_on_packet_recv = func; } void RegisterPotentialPatch(EQ::Patches::BasePatch *patch) { m_possible_patches.push_back(std::unique_ptr(patch)); } private: @@ -50,13 +50,13 @@ namespace EQ DaybreakConnectionManager m_daybreak; std::function)> m_on_new_connection; std::function, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change; - std::function, EmuOpcode, Packet &)> m_on_packet_recv; + std::function, EmuOpcode, const Packet &)> m_on_packet_recv; std::map, std::shared_ptr> m_streams; std::vector> m_possible_patches; void DaybreakNewConnection(std::shared_ptr connection); void DaybreakConnectionStateChange(std::shared_ptr connection, DbProtocolStatus from, DbProtocolStatus to); - void DaybreakPacketRecv(std::shared_ptr connection, Packet &p); + void DaybreakPacketRecv(std::shared_ptr connection, const Packet &p); friend class EQStream; }; diff --git a/loginserver/client_manager.cpp b/loginserver/client_manager.cpp index 5aa7fc1e3..ef9d724f8 100644 --- a/loginserver/client_manager.cpp +++ b/loginserver/client_manager.cpp @@ -79,7 +79,7 @@ void ClientManager::HandleConnectionChange(std::shared_ptr co } } -void ClientManager::HandlePacket(std::shared_ptr connection, EmuOpcode opcode, EQ::Net::Packet &p) +void ClientManager::HandlePacket(std::shared_ptr connection, EmuOpcode opcode, const EQ::Net::Packet &p) { auto iter = clients.begin(); while (iter != clients.end()) { diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h index 7ac89ecac..ac2c6b737 100644 --- a/loginserver/client_manager.h +++ b/loginserver/client_manager.h @@ -60,7 +60,7 @@ private: void HandleNewConnectionTitanium(std::shared_ptr connection); void HandleNewConnectionSod(std::shared_ptr connection); void HandleConnectionChange(std::shared_ptr connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status); - void HandlePacket(std::shared_ptr connection, EmuOpcode opcode, EQ::Net::Packet &p); + void HandlePacket(std::shared_ptr connection, EmuOpcode opcode, const EQ::Net::Packet &p); std::list> clients; std::unique_ptr titanium_stream; diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp index ff9f67b0a..6f06f760a 100644 --- a/ucs/clientlist.cpp +++ b/ucs/clientlist.cpp @@ -2134,7 +2134,7 @@ void Clientlist::HandleConnectionChange(std::shared_ptr conne } } -void Clientlist::HandlePacket(std::shared_ptr connection, EmuOpcode opcode, EQ::Net::Packet &p) +void Clientlist::HandlePacket(std::shared_ptr connection, EmuOpcode opcode, const EQ::Net::Packet &p) { auto iter = ClientChatConnections.begin(); while (iter != ClientChatConnections.end()) { diff --git a/ucs/clientlist.h b/ucs/clientlist.h index 72dba31a6..83a844b64 100644 --- a/ucs/clientlist.h +++ b/ucs/clientlist.h @@ -187,7 +187,7 @@ public: private: void HandleNewConnection(std::shared_ptr connection); void HandleConnectionChange(std::shared_ptr connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status); - void HandlePacket(std::shared_ptr connection, EmuOpcode opcode, EQ::Net::Packet &p); + void HandlePacket(std::shared_ptr connection, EmuOpcode opcode, const EQ::Net::Packet &p); std::unique_ptr chatsf; std::unique_ptr chat_patch;