From 1e555756fa8564c6868be20c9a01d862238e922e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 17 May 2019 16:22:50 +0800 Subject: [PATCH] 1 --- server/wsproxy/app.cc | 14 +++++++++++--- server/wsproxy/app.h | 2 -- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc index 266aa55..f6a5f80 100644 --- a/server/wsproxy/app.cc +++ b/server/wsproxy/app.cc @@ -309,9 +309,7 @@ void App::DispatchMsg() break; case SF_MasterServer: { -#if MASTER_MODE ProcessMasterServerMsg(hdr); -#endif } break; } @@ -379,7 +377,17 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr) void App::ProcessMasterServerMsg(f8::MsgHdr& hdr) { - +#if MASTER_MODE + f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->msmsghandler, + hdr.msgid); + if (handler) { + switch (handler->handlerid) { + case HID_MasterSvrMgr: + ProcessNetMsg(handler, MasterSvrMgr::Instance(), hdr); + break; + } + } +#endif } void App::ProcessTargetServerMsg(f8::MsgHdr& hdr) diff --git a/server/wsproxy/app.h b/server/wsproxy/app.h index 6b8c333..8fdb272 100644 --- a/server/wsproxy/app.h +++ b/server/wsproxy/app.h @@ -42,9 +42,7 @@ private: void ProcessIMMsg(); void ProcessClientMsg(f8::MsgHdr& hdr); -#if MASTER_MODE void ProcessMasterServerMsg(f8::MsgHdr& hdr); -#endif void ProcessTargetServerMsg(f8::MsgHdr& hdr); void InitLog();