From 179d04da21a900c651beb00e9ebed4b2d321c9ac Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Sun, 9 Apr 2023 09:22:43 +0000
Subject: [PATCH] 1

---
 server/wsproxy/downstreammgr.cc | 13 ++++---------
 server/wsproxy/downstreammgr.h  |  6 ++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/server/wsproxy/downstreammgr.cc b/server/wsproxy/downstreammgr.cc
index 79bb4c4..4f2e478 100644
--- a/server/wsproxy/downstreammgr.cc
+++ b/server/wsproxy/downstreammgr.cc
@@ -54,12 +54,11 @@ void DownStreamMgr::OnClientDisconnect(int socket_handle)
 #endif
 }
 
-#if 0
-void DownStreamMgr::OnTargetServerDisconnect(a8::XParams& param)
+void DownStreamMgr::OnUpStreamDisconnect(int instance_id)
 {
-    std::list<GameClient*> delete_client;
+    std::list<std::shared_ptr<DownStream>> delete_client;
     for (auto& pair : socket_hash_) {
-        if (pair.second->conn && pair.second->conn->instance_id == param.sender.GetInt()) {
+        if (pair.second->conn && pair.second->conn->instance_id == instance_id) {
             delete_client.push_back(pair.second);
         }
     }
@@ -67,17 +66,13 @@ void DownStreamMgr::OnTargetServerDisconnect(a8::XParams& param)
         RemovePendingAccount(client->socket_handle);
         GCListener::Instance()->ForceCloseClient(client->socket_handle);
         socket_hash_.erase(client->socket_handle);
-        delete client;
     }
 }
-#endif
 
-#if 0
-void DownStreamMgr::OnTargetServerConnect(a8::XParams& param)
+void DownStreamMgr::OnUpStreamConnect(int instance_id)
 {
 
 }
-#endif
 
 std::weak_ptr<DownStream> DownStreamMgr::GetGameClientBySocket(int sockhandle)
 {
diff --git a/server/wsproxy/downstreammgr.h b/server/wsproxy/downstreammgr.h
index 4ef44cb..6afdf76 100644
--- a/server/wsproxy/downstreammgr.h
+++ b/server/wsproxy/downstreammgr.h
@@ -15,10 +15,8 @@ class DownStreamMgr : public a8::Singleton<DownStreamMgr>
     void Init();
     void UnInit();
 
-    #if 0
-    void OnTargetServerDisconnect(a8::XParams& param);
-    void OnTargetServerConnect(a8::XParams& param);
-    #endif
+    void OnUpStreamDisconnect(int instance_id);
+    void OnUpStreamConnect(int instance_id);
     std::weak_ptr<DownStream> GetGameClientBySocket(int sockhande);
     void BindUpStream(int socket_handle, int conn_instance_id);
     void AddPendingAccount(const std::string& account_id, int socket_handle, long long req_tick);