diff --git a/server/masterserver/GGListener.h b/server/masterserver/GGListener.h index 0a6bc29..914df5b 100644 --- a/server/masterserver/GGListener.h +++ b/server/masterserver/GGListener.h @@ -12,9 +12,6 @@ class GGListener : public a8::Singleton GGListener() {}; friend class a8::Singleton; - public: - enum { HID = HID_GGListener }; - public: void Init(); void UnInit(); diff --git a/server/masterserver/app.cc b/server/masterserver/app.cc index bbc6052..2ea5139 100755 --- a/server/masterserver/app.cc +++ b/server/masterserver/app.cc @@ -15,6 +15,7 @@ #include "app.h" #include "jsondatamgr.h" #include "handlermgr.h" +#include "gsmgr.h" #include "ss_msgid.pb.h" #include "ss_proto.pb.h" @@ -338,10 +339,8 @@ void App::ProcessGameGateMsg(f8::MsgHdr& hdr) hdr.msgid); if (handler) { switch (handler->handlerid) { - case HID_GGListener: - #if 0 - ProcessNetMsg(handler, GGListener::Instance(), hdr); - #endif + case HID_GSMgr: + ProcessNetMsg(handler, GSMgr::Instance(), hdr); break; } } diff --git a/server/masterserver/constant.h b/server/masterserver/constant.h index cca524d..9fb76aa 100755 --- a/server/masterserver/constant.h +++ b/server/masterserver/constant.h @@ -19,11 +19,7 @@ enum InnerMesssage_e //网络处理对象 enum NetHandler_e { - HID_Player, - HID_PlayerMgr, - HID_Room, - HID_RoomMgr, - HID_GGListener, + HID_GSMgr, }; enum PlayerState_e diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc new file mode 100644 index 0000000..b4d5595 --- /dev/null +++ b/server/masterserver/gsmgr.cc @@ -0,0 +1,18 @@ +#include "precompile.h" + +#include "gsmgr.h" + +void GSMgr::Init() +{ + +} + +void GSMgr::UnInit() +{ + +} + +void GSMgr::_SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_RequestTargetServer& msg) +{ + +} diff --git a/server/masterserver/gsmgr.h b/server/masterserver/gsmgr.h new file mode 100644 index 0000000..2b518c7 --- /dev/null +++ b/server/masterserver/gsmgr.h @@ -0,0 +1,21 @@ +#pragma once + +#include "ss_proto.pb.h" + +class GSMgr : public a8::Singleton +{ + public: + enum { HID = HID_GSMgr }; + + private: + GSMgr() {}; + friend class a8::Singleton; + + public: + + void Init(); + void UnInit(); + + void _SS_WSP_RequestTargetServer(f8::MsgHdr& hdr, const ss::SS_WSP_RequestTargetServer& msg); + +}; diff --git a/server/masterserver/handlermgr.cc b/server/masterserver/handlermgr.cc index ff3680c..b46d55c 100644 --- a/server/masterserver/handlermgr.cc +++ b/server/masterserver/handlermgr.cc @@ -7,6 +7,7 @@ #include "GGListener.h" #include "app.h" #include "cs_proto.pb.h" +#include "gsmgr.h" static void _GMOpsSelfChecking(f8::JsonHttpRequest* request) { @@ -37,6 +38,7 @@ void HandlerMgr::UnInit() void HandlerMgr::RegisterNetMsgHandlers() { + RegisterNetMsgHandler(&ggmsghandler, &GSMgr::_SS_WSP_RequestTargetServer); } void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle, diff --git a/server/masterserver/handlermgr.h b/server/masterserver/handlermgr.h index bcbbdd8..2bf21b8 100644 --- a/server/masterserver/handlermgr.h +++ b/server/masterserver/handlermgr.h @@ -22,9 +22,6 @@ class HandlerMgr : public a8::Singleton void UnInit(); f8::NetMsgHandlerObject ggmsghandler; - f8::NetMsgHandlerObject dbmsghandler; - f8::NetMsgHandlerObject dpmsghandler; - f8::NetMsgHandlerObject bsmsghandler; void ProcGMMsg(unsigned long saddr, int sockhandle, const std::string& url, const std::string& quyerstr); diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index dc026c8..c0cd9d2 100755 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -1,4 +1,16 @@ package ss; -import "cs_proto.proto"; +message SS_WSP_RequestTargetServer +{ + optional int64 context_id = 1; + optional string account_id = 2; + optional string team_id = 3; +} +message SS_MS_ResponseTargetServer +{ + optional int64 context_id = 1; + optional int32 instance_id = 2; + optional string host = 3; + optional int32 port = 4; +}