From 51b01f8e796ce20e399112daa5d38171870b81d4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 24 Apr 2023 11:40:28 +0800
Subject: [PATCH] 1

---
 server/wsproxy/downstream.cc | 11 +++++------
 server/wsproxy/downstream.h  |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/server/wsproxy/downstream.cc b/server/wsproxy/downstream.cc
index 4b92fc2..628cc67 100644
--- a/server/wsproxy/downstream.cc
+++ b/server/wsproxy/downstream.cc
@@ -5,6 +5,7 @@
 #include "longsessionmgr.h"
 #include "GCListener.h"
 #include "longsession.h"
+#include "kcpsession.h"
 
 #include "ss_proto.pb.h"
 
@@ -32,14 +33,12 @@ void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr)
         memmove(buff + sizeof(f8::PackHead), hdr.buf, hdr.buflen);
     }
 
-    #ifdef USE_KCP
-    auto session = GetKcpSessionBySocketHandle(hdr.socket_handle);
+    auto session = LongSessionMgr::Instance()->GetSession(hdr.socket_handle);
     if (session) {
-        session->SendClientMsg(buff, sizeof(f8::PackHead) + head->packlen);
+        session->GetKcpSession()->SendClientMsg(buff, sizeof(f8::PackHead) + head->packlen);
+    } else {
+        GCListener::Instance()->SendBuf(hdr.socket_handle, buff, sizeof(f8::PackHead) + head->packlen);
     }
-    #else
-    GCListener::Instance()->SendBuf(hdr.socket_handle, buff, sizeof(f8::PackHead) + head->packlen);
-    #endif
     free(buff);
 }
 
diff --git a/server/wsproxy/downstream.h b/server/wsproxy/downstream.h
index 9416939..8a921a2 100644
--- a/server/wsproxy/downstream.h
+++ b/server/wsproxy/downstream.h
@@ -17,5 +17,4 @@ class DownStream
 private:
     int socket_handle_ = a8::INVALID_SOCKET_HANDLE;
     std::weak_ptr<UpStream> up_;
-    int type_ = 0;
 };