From 765b0b95cf3764d7ebf7c28177618d2bee8abb44 Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Mon, 13 Nov 2023 07:05:38 +0000
Subject: [PATCH] 1

---
 server/wsproxy/app.cc        | 14 +++++++-------
 server/wsproxy/app.h         |  6 +++---
 server/wsproxy/downstream.cc |  4 ++--
 server/wsproxy/downstream.h  |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc
index 304b384..e7f22f3 100644
--- a/server/wsproxy/app.cc
+++ b/server/wsproxy/app.cc
@@ -176,7 +176,7 @@ bool App::HasTask()
     return false;
 }
 
-void App::ProcessClientMsg(f8::MsgHdr* hdr, int tag)
+void App::ProcessClientMsg(f8::MsgHdr* hdr)
 {
     if (hdr->msgid == ss::_SS_CMLogin ||
         hdr->msgid == ss::_SS_CMReconnect ||
@@ -235,12 +235,12 @@ void App::ProcessClientMsg(f8::MsgHdr* hdr, int tag)
     } else {
         auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr->socket_handle);
         if (auto down = down_wp.lock(); !down_wp.expired()) {
-            down->ProcCMMsg(hdr, tag);
+            down->ProcCMMsg(hdr);
         }
     }
 }
 
-void App::ProcessMasterServerMsg(f8::MsgHdr* hdr, int tag)
+void App::ProcessMasterServerMsg(f8::MsgHdr* hdr)
 {
     f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->msmsghandler,
                                                       hdr->msgid);
@@ -253,7 +253,7 @@ void App::ProcessMasterServerMsg(f8::MsgHdr* hdr, int tag)
     }
 }
 
-void App::ProcessTargetServerMsg(f8::MsgHdr* hdr, int tag)
+void App::ProcessTargetServerMsg(f8::MsgHdr* hdr)
 {
     if (hdr->msgid == ss::_SS_ForceCloseSocket) {
         GCListener::Instance()->ForceCloseClient(hdr->socket_handle);
@@ -367,17 +367,17 @@ void App::DispatchSocketMsg(f8::MsgHdr* hdr)
     switch (hdr->sockfrom) {
     case SF_Client:
         {
-            ProcessClientMsg(hdr, hdr->tag);
+            ProcessClientMsg(hdr);
         }
         break;
     case SF_TargetServer:
         {
-            ProcessTargetServerMsg(hdr, hdr->tag);
+            ProcessTargetServerMsg(hdr);
         }
         break;
     case SF_MasterServer:
         {
-            ProcessMasterServerMsg(hdr, hdr->tag);
+            ProcessMasterServerMsg(hdr);
         }
         break;
     }
diff --git a/server/wsproxy/app.h b/server/wsproxy/app.h
index bbdc436..d8fe181 100644
--- a/server/wsproxy/app.h
+++ b/server/wsproxy/app.h
@@ -39,9 +39,9 @@ private:
 
     void DispatchUdpMsg();
 
-    void ProcessClientMsg(f8::MsgHdr* hdr, int tag);
-    void ProcessMasterServerMsg(f8::MsgHdr* hdr, int tag);
-    void ProcessTargetServerMsg(f8::MsgHdr* hdr, int tag);
+    void ProcessClientMsg(f8::MsgHdr* hdr);
+    void ProcessMasterServerMsg(f8::MsgHdr* hdr);
+    void ProcessTargetServerMsg(f8::MsgHdr* hdr);
 
     void FreeUdpMsgQueue();
 
diff --git a/server/wsproxy/downstream.cc b/server/wsproxy/downstream.cc
index 0a4625b..d83bf8c 100644
--- a/server/wsproxy/downstream.cc
+++ b/server/wsproxy/downstream.cc
@@ -73,9 +73,9 @@ void DownStream::OnClose()
     }
 }
 
-void DownStream::ProcCMMsg(f8::MsgHdr* hdr, int tag)
+void DownStream::ProcCMMsg(f8::MsgHdr* hdr)
 {
-    if (hdr->msgid == ss::_SS_CMPing && IsLongSession() && tag == ST_Tcp) {
+    if (hdr->msgid == ss::_SS_CMPing && IsLongSession() && hdr->tag == ST_Tcp) {
         ss::SS_SMPing msg;
         GCListener::Instance()->SendMsgEx(socket_handle_, ss::_SS_CMPing, msg);
         if (!long_session_wp_.expired()) {
diff --git a/server/wsproxy/downstream.h b/server/wsproxy/downstream.h
index 85f0a56..9e75640 100644
--- a/server/wsproxy/downstream.h
+++ b/server/wsproxy/downstream.h
@@ -12,7 +12,7 @@ class DownStream
     std::weak_ptr<UpStream> GetUpStream() const { return up_; }
     void ReBindUpStream(std::weak_ptr<UpStream> up);
     bool IsLongSession() { return is_long_session_; }
-    void ProcCMMsg(f8::MsgHdr* hdr, int tag);
+    void ProcCMMsg(f8::MsgHdr* hdr);
 
     void ForwardUpStreamMsg(f8::MsgHdr* hdr);
     void OnClose();