diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc index a046782..c03b28c 100755 --- a/server/masterserver/app.cc +++ b/server/masterserver/app.cc @@ -312,7 +312,7 @@ void App::DispatchMsg() void App::ProcessGameGateMsg(f8::MsgHdr& hdr) { - f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->ggmsghandler, + f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->wsmsghandler, hdr.msgid); if (handler) { switch (handler->handlerid) { diff --git a/server/masterserver/handlermgr.cc b/server/masterserver/handlermgr.cc index b581777..7d663f9 100644 --- a/server/masterserver/handlermgr.cc +++ b/server/masterserver/handlermgr.cc @@ -44,9 +44,9 @@ void HandlerMgr::UnInit() void HandlerMgr::RegisterNetMsgHandlers() { - RegisterNetMsgHandler(&ggmsghandler, &SvrMgr::_SS_WSP_RequestTargetServer); + RegisterNetMsgHandler(&wsmsghandler, &SvrMgr::_SS_WSP_RequestTargetServer); - RegisterNetMsgHandler(&ggmsghandler, &WSListener::_SS_Ping); + RegisterNetMsgHandler(&wsmsghandler, &WSListener::_SS_Ping); RegisterNetMsgHandler(&immsghandler, &IMSMgr::_SS_Ping); RegisterNetMsgHandler(&immsghandler, &SvrMgr::_SS_IM_ReportServerInfo); diff --git a/server/masterserver/handlermgr.h b/server/masterserver/handlermgr.h index 44c4ddd..4b9fc01 100644 --- a/server/masterserver/handlermgr.h +++ b/server/masterserver/handlermgr.h @@ -21,7 +21,7 @@ class HandlerMgr : public a8::Singleton void Init(); void UnInit(); - f8::NetMsgHandlerObject ggmsghandler; + f8::NetMsgHandlerObject wsmsghandler; f8::NetMsgHandlerObject immsghandler; void ProcGMMsg(unsigned long saddr, int sockhandle,