From 54336693e43c2b41546ea45f93356bcb260a1fd4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 24 Apr 2023 11:01:29 +0800 Subject: [PATCH] 1 --- server/wsproxy/downstream.cc | 9 +++++++++ server/wsproxy/downstream.h | 1 + server/wsproxy/downstreammgr.cc | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/server/wsproxy/downstream.cc b/server/wsproxy/downstream.cc index d454ff4..7982921 100644 --- a/server/wsproxy/downstream.cc +++ b/server/wsproxy/downstream.cc @@ -1,8 +1,17 @@ #include "precompile.h" #include "downstream.h" +#include "upstream.h" + +#include "ss_proto.pb.h" void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr) { } + +void DownStream::OnClose() +{ + ss::SS_WSP_SocketDisconnect msg; + conn.lock()->SendMsg(socket_handle, msg); +} diff --git a/server/wsproxy/downstream.h b/server/wsproxy/downstream.h index d5be9e1..56a0fc1 100644 --- a/server/wsproxy/downstream.h +++ b/server/wsproxy/downstream.h @@ -8,6 +8,7 @@ class DownStream std::weak_ptr conn; void ForwardUpStreamMsg(f8::MsgHdr& hdr); + void OnClose(); private: int type_ = 0; diff --git a/server/wsproxy/downstreammgr.cc b/server/wsproxy/downstreammgr.cc index 06c6db4..303fd36 100644 --- a/server/wsproxy/downstreammgr.cc +++ b/server/wsproxy/downstreammgr.cc @@ -44,8 +44,7 @@ void DownStreamMgr::OnClientDisconnect(int socket_handle) auto down_wp = GetDownStream(socket_handle); if (auto down = down_wp.lock(); !down_wp.expired()) { if (!down->conn.expired()) { - ss::SS_WSP_SocketDisconnect msg; - down->conn.lock()->SendMsg(socket_handle, msg); + down->OnClose(); } socket_hash_.erase(socket_handle); } @@ -123,7 +122,8 @@ void DownStreamMgr::AddPendingAccount(const std::string& account_id, int socket_ { if (a8::TIMER_EXEC_EVENT == event) { pending_account_hash_.erase(socket_handle); - App::Instance()->perf.max_join_time = std::max((long long)1000 * 10, App::Instance()->perf.max_join_time); + App::Instance()->perf.max_join_time = + std::max((long long)1000 * 10, App::Instance()->perf.max_join_time); } }, &timer_attacher_