From 3901bc643362c57b8518fe719dc7d4f76e14aec6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 17 Jun 2020 11:34:41 +0800 Subject: [PATCH] 1 --- server/imserver/IMConnMgr.cc | 5 +++++ server/imserver/IMConnMgr.h | 5 ++++- server/imserver/handlermgr.cc | 1 + server/masterserver/GGListener.h | 2 +- server/masterserver/constant.h | 1 + 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/imserver/IMConnMgr.cc b/server/imserver/IMConnMgr.cc index b29f2cc..c12ec36 100644 --- a/server/imserver/IMConnMgr.cc +++ b/server/imserver/IMConnMgr.cc @@ -47,6 +47,11 @@ IMConn* IMConnMgr::RecreateIMConn(const std::string& host, int port) return conn; } +void IMConnMgr::_SS_Pong(f8::MsgHdr& hdr, const ss::SS_Pong& msg) +{ + +} + void IMConnMgr::_SS_MS_IMServerList(f8::MsgHdr& hdr, const ss::SS_MS_IMServerList& msg) { diff --git a/server/imserver/IMConnMgr.h b/server/imserver/IMConnMgr.h index 03d7113..edec974 100644 --- a/server/imserver/IMConnMgr.h +++ b/server/imserver/IMConnMgr.h @@ -3,6 +3,7 @@ namespace ss { class MFIMMsgConext; + class SS_Pong; class SS_MS_LoadGroup; class SS_MS_IMServerList; } @@ -22,9 +23,11 @@ class IMConnMgr : public a8::Singleton void Init(); void UnInit(); + void _SS_MS_IMServerList(f8::MsgHdr& hdr, const ss::SS_MS_IMServerList& msg); + void _SS_Pong(f8::MsgHdr& hdr, const ss::SS_Pong& msg); + IMConn* GetConnByKey(const std::string& key); IMConn* RecreateIMConn(const std::string& host, int port); - void _SS_MS_IMServerList(f8::MsgHdr& hdr, const ss::SS_MS_IMServerList& msg); void TraverseIMConn(std::function func); private: diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc index 3be004f..5c5bdc3 100644 --- a/server/imserver/handlermgr.cc +++ b/server/imserver/handlermgr.cc @@ -41,6 +41,7 @@ void HandlerMgr::RegisterNetMsgHandlers() RegisterNetMsgHandler(&mscmsghandler, &GroupMgr::_SS_MS_LoadGroup); RegisterNetMsgHandler(&mscmsghandler, &GroupMgr::_SS_MS_ForwardGroupCMMsg); + RegisterNetMsgHandler(&mscmsghandler, &IMConnMgr::_SS_Pong); RegisterNetMsgHandler(&mscmsghandler, &IMConnMgr::_SS_MS_IMServerList); RegisterNetMsgHandler(&imcmsghandler, &PlayerMgr::_SS_IM_SendChatMsg); diff --git a/server/masterserver/GGListener.h b/server/masterserver/GGListener.h index 929c625..aff1698 100644 --- a/server/masterserver/GGListener.h +++ b/server/masterserver/GGListener.h @@ -14,7 +14,7 @@ namespace ss class GGListener : public a8::Singleton { public: - enum { HID = HID_SvrMgr }; + enum { HID = HID_GGListener }; private: GGListener() {}; diff --git a/server/masterserver/constant.h b/server/masterserver/constant.h index 655f757..20a87a5 100755 --- a/server/masterserver/constant.h +++ b/server/masterserver/constant.h @@ -20,6 +20,7 @@ enum NetHandler_e HID_SvrMgr, HID_IMSMgr, HID_CacheMgr, + HID_GGListener }; const char* const PROJ_NAME_FMT = "friend_masterserver";