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

GCC compile fixes

Browse Source
This commit is contained in:
KimLS 2016-09-12 19:48:48 -07:00
parent 3469af6777
commit 59df65fa21
10 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/eq_stream.cpp
View File

@ -41,7 +41,6 @@
#include <netdb.h> #include <netdb.h>
#include <fcntl.h> #include <fcntl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "net\eqstream.h"
#endif #endif
//for logsys //for logsys

15
common/net/daybreak_connection.cpp
View File

@ -57,7 +57,7 @@ void EQ::Net::DaybreakConnectionManager::Attach(uv_loop_t *loop)
rc = uv_udp_recv_start(&m_socket, rc = uv_udp_recv_start(&m_socket,
[](uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { [](uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) {
buf->base = new char[suggested_size]; 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) { [](uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf, const struct sockaddr* addr, unsigned flags) {
DaybreakConnectionManager *c = (DaybreakConnectionManager*)handle->data; DaybreakConnectionManager *c = (DaybreakConnectionManager*)handle->data;
@ -82,7 +82,7 @@ void EQ::Net::DaybreakConnectionManager::Detach()
if (m_attached) { if (m_attached) {
uv_udp_recv_stop(&m_socket); uv_udp_recv_stop(&m_socket);
uv_timer_stop(&m_timer); 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::DaybreakConnection> EQ::Net::DaybreakConnectionManager::FindConnectionByEndpoint(std::string addr, int port) std::shared_ptr<EQ::Net::DaybreakConnection> 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()) { if (iter != m_connections.end()) {
return iter->second; return iter->second;
} }
@ -224,7 +225,7 @@ void EQ::Net::DaybreakConnectionManager::SendSessionLost(const std::string &addr
uv_buf_t send_buffers[1]; uv_buf_t send_buffers[1];
send_buffers[0].base = (char*)out.Data(); 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, int ret = uv_udp_send(send_req, &m_socket, send_buffers, 1, (sockaddr*)&send_addr,
[](uv_udp_send_t* req, int status) { [](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.GetInt8(0) == 0) {
if (p.Length() < 2) { if (p.Length() < 2) {
@ -1078,7 +1079,7 @@ void EQ::Net::DaybreakConnection::InternalSend(Packet &p)
uv_buf_t send_buffers[1]; uv_buf_t send_buffers[1];
send_buffers[0].base = (char*)out.Data(); 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); uv_udp_send(send_req, &m_owner->m_socket, send_buffers, 1, (sockaddr*)&send_addr, send_func);
m_stats.sent_bytes += out.Length(); m_stats.sent_bytes += out.Length();
@ -1092,7 +1093,7 @@ void EQ::Net::DaybreakConnection::InternalSend(Packet &p)
uv_buf_t send_buffers[1]; uv_buf_t send_buffers[1];
send_buffers[0].base = (char*)p.Data(); 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); uv_udp_send(send_req, &m_owner->m_socket, send_buffers, 1, (sockaddr*)&send_addr, send_func);
m_stats.sent_bytes += p.Length(); m_stats.sent_bytes += p.Length();

6
common/net/daybreak_connection.h
View File

@ -173,7 +173,7 @@ namespace EQ
void ProcessQueue(); void ProcessQueue();
void RemoveFromQueue(int stream, uint16_t seq); void RemoveFromQueue(int stream, uint16_t seq);
void AddToQueue(int stream, uint16_t seq, const Packet &p); void AddToQueue(int stream, uint16_t seq, const Packet &p);
void ProcessDecodedPacket(Packet &p); void ProcessDecodedPacket(const Packet &p);
void ChangeStatus(DbProtocolStatus new_status); void ChangeStatus(DbProtocolStatus new_status);
bool ValidateCRC(Packet &p); bool ValidateCRC(Packet &p);
void AppendCRC(Packet &p); void AppendCRC(Packet &p);
@ -245,7 +245,7 @@ namespace EQ
void ProcessResend(); void ProcessResend();
void OnNewConnection(std::function<void(std::shared_ptr<DaybreakConnection>)> func) { m_on_new_connection = func; } void OnNewConnection(std::function<void(std::shared_ptr<DaybreakConnection>)> func) { m_on_new_connection = func; }
void OnConnectionStateChange(std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; } void OnConnectionStateChange(std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
void OnPacketRecv(std::function<void(std::shared_ptr<DaybreakConnection>, Packet &)> func) { m_on_packet_recv = func; } void OnPacketRecv(std::function<void(std::shared_ptr<DaybreakConnection>, const Packet &)> func) { m_on_packet_recv = func; }
private: private:
void Attach(uv_loop_t *loop); void Attach(uv_loop_t *loop);
void Detach(); void Detach();
@ -258,7 +258,7 @@ namespace EQ
DaybreakConnectionManagerOptions m_options; DaybreakConnectionManagerOptions m_options;
std::function<void(std::shared_ptr<DaybreakConnection>)> m_on_new_connection; std::function<void(std::shared_ptr<DaybreakConnection>)> m_on_new_connection;
std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change; std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
std::function<void(std::shared_ptr<DaybreakConnection>, Packet&)> m_on_packet_recv; std::function<void(std::shared_ptr<DaybreakConnection>, const Packet&)> m_on_packet_recv;
std::map<std::pair<std::string, int>, std::shared_ptr<DaybreakConnection>> m_connections; std::map<std::pair<std::string, int>, std::shared_ptr<DaybreakConnection>> m_connections;
void ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size); void ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size);

2
common/net/daybreak_structs.h
View File

@ -167,8 +167,6 @@ namespace EQ
CEREAL_NVP(our_timestamp), CEREAL_NVP(our_timestamp),
CEREAL_NVP(client_sent), CEREAL_NVP(client_sent),
CEREAL_NVP(client_recv), CEREAL_NVP(client_recv),
CEREAL_NVP(max_ping),
CEREAL_NVP(last_ping),
CEREAL_NVP(server_sent), CEREAL_NVP(server_sent),
CEREAL_NVP(server_recv)); CEREAL_NVP(server_recv));
} }

2
common/net/eqstream.cpp
View File

@ -37,7 +37,7 @@ void EQ::Net::EQStreamManager::DaybreakConnectionStateChange(std::shared_ptr<Day
} }
} }
void EQ::Net::EQStreamManager::DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, Packet &p) void EQ::Net::EQStreamManager::DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, const Packet &p)
{ {
auto iter = m_streams.find(connection); auto iter = m_streams.find(connection);
if (iter != m_streams.end()) { if (iter != m_streams.end()) {

6
common/net/eqstream.h
View File

@ -42,7 +42,7 @@ namespace EQ
void OnNewConnection(std::function<void(std::shared_ptr<EQStream>)> func) { m_on_new_connection = func; } void OnNewConnection(std::function<void(std::shared_ptr<EQStream>)> func) { m_on_new_connection = func; }
void OnConnectionStateChange(std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; } void OnConnectionStateChange(std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
void OnPacketRecv(std::function<void(std::shared_ptr<EQStream>, EmuOpcode, Packet &)> func) { m_on_packet_recv = func; } void OnPacketRecv(std::function<void(std::shared_ptr<EQStream>, EmuOpcode, const Packet &)> func) { m_on_packet_recv = func; }
void RegisterPotentialPatch(EQ::Patches::BasePatch *patch) { m_possible_patches.push_back(std::unique_ptr<EQ::Patches::BasePatch>(patch)); } void RegisterPotentialPatch(EQ::Patches::BasePatch *patch) { m_possible_patches.push_back(std::unique_ptr<EQ::Patches::BasePatch>(patch)); }
private: private:
@ -50,13 +50,13 @@ namespace EQ
DaybreakConnectionManager m_daybreak; DaybreakConnectionManager m_daybreak;
std::function<void(std::shared_ptr<EQStream>)> m_on_new_connection; std::function<void(std::shared_ptr<EQStream>)> m_on_new_connection;
std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change; std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
std::function<void(std::shared_ptr<EQStream>, EmuOpcode, Packet &)> m_on_packet_recv; std::function<void(std::shared_ptr<EQStream>, EmuOpcode, const Packet &)> m_on_packet_recv;
std::map<std::shared_ptr<DaybreakConnection>, std::shared_ptr<EQStream>> m_streams; std::map<std::shared_ptr<DaybreakConnection>, std::shared_ptr<EQStream>> m_streams;
std::vector<std::unique_ptr<EQ::Patches::BasePatch>> m_possible_patches; std::vector<std::unique_ptr<EQ::Patches::BasePatch>> m_possible_patches;
void DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection); void DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection);
void DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to); void DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
void DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, Packet &p); void DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, const Packet &p);
friend class EQStream; friend class EQStream;
}; };

2
loginserver/client_manager.cpp
View File

@ -79,7 +79,7 @@ void ClientManager::HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> co
} }
} }
void ClientManager::HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, EQ::Net::Packet &p) void ClientManager::HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, const EQ::Net::Packet &p)
{ {
auto iter = clients.begin(); auto iter = clients.begin();
while (iter != clients.end()) { while (iter != clients.end()) {

2
loginserver/client_manager.h
View File

@ -60,7 +60,7 @@ private:
void HandleNewConnectionTitanium(std::shared_ptr<EQ::Net::EQStream> connection); void HandleNewConnectionTitanium(std::shared_ptr<EQ::Net::EQStream> connection);
void HandleNewConnectionSod(std::shared_ptr<EQ::Net::EQStream> connection); void HandleNewConnectionSod(std::shared_ptr<EQ::Net::EQStream> connection);
void HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status); void HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status);
void HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, EQ::Net::Packet &p); void HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, const EQ::Net::Packet &p);
std::list<std::unique_ptr<Client>> clients; std::list<std::unique_ptr<Client>> clients;
std::unique_ptr<EQ::Net::EQStreamManager> titanium_stream; std::unique_ptr<EQ::Net::EQStreamManager> titanium_stream;

2
ucs/clientlist.cpp
View File

@ -2134,7 +2134,7 @@ void Clientlist::HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> conne
} }
} }
void Clientlist::HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, EQ::Net::Packet &p) void Clientlist::HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, const EQ::Net::Packet &p)
{ {
auto iter = ClientChatConnections.begin(); auto iter = ClientChatConnections.begin();
while (iter != ClientChatConnections.end()) { while (iter != ClientChatConnections.end()) {

2
ucs/clientlist.h
View File

@ -187,7 +187,7 @@ public:
private: private:
void HandleNewConnection(std::shared_ptr<EQ::Net::EQStream> connection); void HandleNewConnection(std::shared_ptr<EQ::Net::EQStream> connection);
void HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status); void HandleConnectionChange(std::shared_ptr<EQ::Net::EQStream> connection, EQ::Net::DbProtocolStatus old_status, EQ::Net::DbProtocolStatus new_status);
void HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, EQ::Net::Packet &p); void HandlePacket(std::shared_ptr<EQ::Net::EQStream> connection, EmuOpcode opcode, const EQ::Net::Packet &p);
std::unique_ptr<EQ::Net::EQStreamManager> chatsf; std::unique_ptr<EQ::Net::EQStreamManager> chatsf;
std::unique_ptr<EQ::Patches::BasePatch> chat_patch; std::unique_ptr<EQ::Patches::BasePatch> chat_patch;