diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc index 7a9fbfd..721f2f0 100644 --- a/server/wsproxy/app.cc +++ b/server/wsproxy/app.cc @@ -380,6 +380,7 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr) (hdr, msg.team_uuid(), msg.account_id(), + msg.session_id(), "", 0, msg.proto_version()); @@ -395,6 +396,7 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr) (hdr, msg.team_uuid(), msg.account_id(), + msg.session_id(), msg.server_info(), 1, 0); diff --git a/server/wsproxy/mastermgr.cc b/server/wsproxy/mastermgr.cc index 91e09d4..d6fc1f6 100644 --- a/server/wsproxy/mastermgr.cc +++ b/server/wsproxy/mastermgr.cc @@ -91,11 +91,12 @@ std::shared_ptr MasterMgr::GetConnById(int instance_id) } void MasterMgr::RequestTargetServer(f8::MsgHdr& hdr, - const std::string& team_id, - const std::string& account_id, - const std::string& server_info, - int is_reconnect, - int proto_version) + const std::string& team_id, + const std::string& account_id, + const std::string& session_id, + const std::string& server_info, + int is_reconnect, + int proto_version) { if (GetRequestBySocket(hdr.socket_handle)) { return; @@ -128,6 +129,7 @@ void MasterMgr::RequestTargetServer(f8::MsgHdr& hdr, ss::SS_WSP_RequestTargetServer msg; msg.set_context_id(curr_context_id_); msg.set_account_id(account_id); + msg.set_session_id(session_id); msg.set_team_id(team_uuid); msg.set_server_info(server_info); msg.set_is_reconnect(is_reconnect); diff --git a/server/wsproxy/mastermgr.h b/server/wsproxy/mastermgr.h index 41bf9e4..69047cb 100644 --- a/server/wsproxy/mastermgr.h +++ b/server/wsproxy/mastermgr.h @@ -30,6 +30,7 @@ class MasterMgr : public a8::Singleton void RequestTargetServer(f8::MsgHdr& hdr, const std::string& team_id, const std::string& account_id, + const std::string& session_id, const std::string& server_info, int is_reconnect, int proto_version);