diff --git a/server/masterserver/GGListener.cc b/server/masterserver/GGListener.cc index 9ec7263..76cc640 100644 --- a/server/masterserver/GGListener.cc +++ b/server/masterserver/GGListener.cc @@ -35,7 +35,8 @@ public: p->msgid, p->seqid, &buf[offset + sizeof(f8::PackHead)], - p->packlen); + p->packlen, + 0); offset += sizeof(f8::PackHead) + p->packlen; } else { warning = true; @@ -87,7 +88,7 @@ static void GSListeneron_error(a8::TcpListener*, int type, int errorid) void GGListener::Init() { tcp_listener_ = std::make_shared(); - tcp_listener_->RegisterSessionClass(); + tcp_listener_->RegisterSessionClass(1024 * 64); tcp_listener_->on_error = GSListeneron_error; tcp_listener_->bind_address = "0.0.0.0"; diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc index 39af224..3ea8bac 100755 --- a/server/masterserver/app.cc +++ b/server/masterserver/app.cc @@ -63,7 +63,7 @@ void App::UnInit() HandlerMgr::Instance()->UnInit(); } -void App::Update() +void App::Update(int delta_time) { QuickExecute(); SlowerExecute(); @@ -90,7 +90,7 @@ void App::ProcessGameGateMsg(f8::MsgHdr* hdr) if (handler) { switch (handler->handlerid) { case HID_GSMgr: - ProcessNetMsg(handler, GSMgr::Instance(), *hdr); + ProcessNetMsg(handler, GSMgr::Instance(), hdr); break; } } diff --git a/server/masterserver/app.h b/server/masterserver/app.h index 60c3caa..6fd3f7b 100644 --- a/server/masterserver/app.h +++ b/server/masterserver/app.h @@ -21,7 +21,7 @@ public: virtual const std::string GetPkgName() override; virtual void Init() override; virtual void UnInit() override; - virtual void Update() override; + virtual void Update(int delta_time) override; virtual bool HasTask() override; virtual void DispatchSocketMsg(f8::MsgHdr* hdr) override; diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc index d668690..3f02b73 100644 --- a/server/masterserver/gsmgr.cc +++ b/server/masterserver/gsmgr.cc @@ -51,7 +51,7 @@ void GSMgr::UnInit() } -void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_RequestTargetServer& msg) +void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr* hdr, const ss::SS_WSP_RequestTargetServer& msg) { ss::SS_MS_ResponseTargetServer respmsg; respmsg.set_context_id(msg.context_id()); @@ -92,13 +92,13 @@ void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_Reques } } } - GGListener::Instance()->SendMsg(hdr.socket_handle, respmsg); + GGListener::Instance()->SendMsg(hdr->socket_handle, respmsg); } -void GSMgr::_SS_Ping(f8::MsgHdr& hdr, const ss::SS_Ping& msg) +void GSMgr::_SS_Ping(f8::MsgHdr* hdr, const ss::SS_Ping& msg) { ss::SS_Pong pongmsg; - GGListener::Instance()->SendMsg(hdr.socket_handle, pongmsg); + GGListener::Instance()->SendMsg(hdr->socket_handle, pongmsg); } void GSMgr::___GSReport(std::shared_ptr request) diff --git a/server/masterserver/gsmgr.h b/server/masterserver/gsmgr.h index f8660aa..cfed3cf 100644 --- a/server/masterserver/gsmgr.h +++ b/server/masterserver/gsmgr.h @@ -23,8 +23,8 @@ class GSMgr : public a8::Singleton void Init(); void UnInit(); - void _SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_RequestTargetServer& msg); - void _SS_Ping(f8::MsgHdr& hdr, const ss::SS_Ping& msg); + void _SS_WSP_RequestTargetServer(f8::MsgHdr* hdr, const ss::SS_WSP_RequestTargetServer& msg); + void _SS_Ping(f8::MsgHdr* hdr, const ss::SS_Ping& msg); void ___GSReport(std::shared_ptr request); void ___GSList(std::shared_ptr request); diff --git a/third_party/a8 b/third_party/a8 index 56f576e..380074e 160000 --- a/third_party/a8 +++ b/third_party/a8 @@ -1 +1 @@ -Subproject commit 56f576e60d471f0390d12172cf2aa499c0772e93 +Subproject commit 380074e2f78043a71b134c420af20b00127b1967 diff --git a/third_party/f8 b/third_party/f8 index 1c141d8..b172c94 160000 --- a/third_party/f8 +++ b/third_party/f8 @@ -1 +1 @@ -Subproject commit 1c141d8817c21820eb0e79aad3279245a8a72866 +Subproject commit b172c94f398c782d53a3147250c71e3c0eafe890