server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-05-17 16:04:44 +08:00
parent cacc618c2c
commit d16e00654d
5 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/wsproxy/app.cc
View File

@ -304,10 +304,7 @@ void App::DispatchMsg()
break; break;
case SF_TargetServer: case SF_TargetServer:
{ {
#if MASTER_MODE
#else
ProcessTargetServerMsg(hdr); ProcessTargetServerMsg(hdr);
#endif
} }
break; break;
case SF_MasterServer: case SF_MasterServer:
@ -383,12 +380,11 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr)
#endif #endif
} }
#if MASTER_MODE
void App::ProcessMasterServerMsg(f8::MsgHdr& hdr) void App::ProcessMasterServerMsg(f8::MsgHdr& hdr)
{ {
} }
#else
void App::ProcessTargetServerMsg(f8::MsgHdr& hdr) void App::ProcessTargetServerMsg(f8::MsgHdr& hdr)
{ {
if (hdr.msgid < 100) { if (hdr.msgid < 100) {
@ -400,7 +396,6 @@ void App::ProcessTargetServerMsg(f8::MsgHdr& hdr)
} }
GCListener::Instance()->ForwardTargetConnMsg(hdr); GCListener::Instance()->ForwardTargetConnMsg(hdr);
} }
#endif
void App::ProcessIMMsg() void App::ProcessIMMsg()
{ {

3
server/wsproxy/app.h
View File

@ -44,9 +44,8 @@ private:
void ProcessClientMsg(f8::MsgHdr& hdr); void ProcessClientMsg(f8::MsgHdr& hdr);
#if MASTER_MODE #if MASTER_MODE
void ProcessMasterServerMsg(f8::MsgHdr& hdr); void ProcessMasterServerMsg(f8::MsgHdr& hdr);
#else
void ProcessTargetServerMsg(f8::MsgHdr& hdr);
#endif #endif
void ProcessTargetServerMsg(f8::MsgHdr& hdr);
void InitLog(); void InitLog();
void UnInitLog(); void UnInitLog();

3
server/wsproxy/gameclientmgr.cc
View File

@ -55,8 +55,6 @@ GameClient* GameClientMgr::GetGameClientBySocket(int sockhandle)
return itr != socket_hash_.end() ? itr->second : nullptr; return itr != socket_hash_.end() ? itr->second : nullptr;
} }
#if MASTER_MODE
#else
void GameClientMgr::BindTargetConn(int socket_handle, int conn_instance_id) void GameClientMgr::BindTargetConn(int socket_handle, int conn_instance_id)
{ {
TargetConn* conn = TargetConnMgr::Instance()->GetConnById(conn_instance_id); TargetConn* conn = TargetConnMgr::Instance()->GetConnById(conn_instance_id);
@ -72,4 +70,3 @@ void GameClientMgr::BindTargetConn(int socket_handle, int conn_instance_id)
} }
} }
} }
#endif

3
server/wsproxy/gameclientmgr.h
View File

@ -16,10 +16,7 @@ class GameClientMgr : public a8::Singleton<GameClientMgr>
void OnTargetServerDisconnect(a8::XParams& param); void OnTargetServerDisconnect(a8::XParams& param);
void OnTargetServerConnect(a8::XParams& param); void OnTargetServerConnect(a8::XParams& param);
GameClient* GetGameClientBySocket(int sockhande); GameClient* GetGameClientBySocket(int sockhande);
#if MASTER_MODE
#else
void BindTargetConn(int socket_handle, int conn_instance_id); void BindTargetConn(int socket_handle, int conn_instance_id);
#endif
private: private:
std::map<int, GameClient*> socket_hash_; std::map<int, GameClient*> socket_hash_;

1
server/wsproxy/mastersvrmgr.h
View File

@ -35,6 +35,7 @@ class MasterSvrMgr : public a8::Singleton<MasterSvrMgr>
MasterSvr* GetConnById(int instance_id); MasterSvr* GetConnById(int instance_id);
private: private:
int target_conn_id_ = 100;
long long curr_context_id_ = 0; long long curr_context_id_ = 0;
std::map<int, MasterSvr*> mastersvr_hash_; std::map<int, MasterSvr*> mastersvr_hash_;
std::map<int, long long> pending_socket_hash_; std::map<int, long long> pending_socket_hash_;