From dbe993d0ee31bc887ae3f17504fed4f32f11c52f Mon Sep 17 00:00:00 2001
From: azw <vcl_delphi@126.com>
Date: Sun, 9 Apr 2023 07:23:32 +0000
Subject: [PATCH] 1

---
 server/wsproxy/app.cc                       | 6 +++---
 server/wsproxy/{client.cc => downstream.cc} | 2 +-
 server/wsproxy/{client.h => downstream.h}   | 2 +-
 server/wsproxy/gameclientmgr.cc             | 8 ++++----
 server/wsproxy/gameclientmgr.h              | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename server/wsproxy/{client.cc => downstream.cc} (51%)
 rename server/wsproxy/{client.h => downstream.h} (88%)

diff --git a/server/wsproxy/app.cc b/server/wsproxy/app.cc
index f52b0f2..47737c4 100644
--- a/server/wsproxy/app.cc
+++ b/server/wsproxy/app.cc
@@ -16,7 +16,7 @@
 #include "GCListener.h"
 #include "jsondatamgr.h"
 #include "handlermgr.h"
-#include "client.h"
+#include "downstream.h"
 #include "gameclientmgr.h"
 #include "ss_msgid.pb.h"
 #include "ss_proto.pb.h"
@@ -347,7 +347,7 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr)
         return;
     }
     if (hdr.msgid == ss::_SS_CMLogin || hdr.msgid == ss::_SS_CMReconnect) {
-        Client* client = GameClientMgr::Instance()->GetGameClientBySocket(hdr.socket_handle);
+        DownStream* client = GameClientMgr::Instance()->GetGameClientBySocket(hdr.socket_handle);
         if (!client) {
             switch (hdr.msgid) {
             case ss::_SS_CMLogin:
@@ -388,7 +388,7 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr)
             }
         }
     } else {
-        Client* client = GameClientMgr::Instance()->GetGameClientBySocket(hdr.socket_handle);
+        DownStream* client = GameClientMgr::Instance()->GetGameClientBySocket(hdr.socket_handle);
         if (client && client->conn) {
             if (client->conn) {
                 client->conn->ForwardClientMsg(hdr);
diff --git a/server/wsproxy/client.cc b/server/wsproxy/downstream.cc
similarity index 51%
rename from server/wsproxy/client.cc
rename to server/wsproxy/downstream.cc
index 0db222c..027c4a5 100644
--- a/server/wsproxy/client.cc
+++ b/server/wsproxy/downstream.cc
@@ -1,3 +1,3 @@
 #include "precompile.h"
 
-#include "client.h"
+#include "downstream.h"
diff --git a/server/wsproxy/client.h b/server/wsproxy/downstream.h
similarity index 88%
rename from server/wsproxy/client.h
rename to server/wsproxy/downstream.h
index 45a4198..2ba072d 100644
--- a/server/wsproxy/client.h
+++ b/server/wsproxy/downstream.h
@@ -1,7 +1,7 @@
 #pragma once
 
 class TargetConn;
-class Client
+class DownStream
 {
  public:
     int socket_handle = a8::INVALID_SOCKET_HANDLE;
diff --git a/server/wsproxy/gameclientmgr.cc b/server/wsproxy/gameclientmgr.cc
index 6baa53b..521915d 100644
--- a/server/wsproxy/gameclientmgr.cc
+++ b/server/wsproxy/gameclientmgr.cc
@@ -5,7 +5,7 @@
 #include "gameclientmgr.h"
 #include "ss_proto.pb.h"
 
-#include "client.h"
+#include "downstream.h"
 #include "target_conn.h"
 #include "target_conn_mgr.h"
 #include "GCListener.h"
@@ -67,7 +67,7 @@ void GameClientMgr::OnTargetServerConnect(a8::XParams& param)
 }
 #endif
 
-Client* GameClientMgr::GetGameClientBySocket(int sockhandle)
+DownStream* GameClientMgr::GetGameClientBySocket(int sockhandle)
 {
     auto itr = socket_hash_.find(sockhandle);
     return itr != socket_hash_.end() ? itr->second : nullptr;
@@ -77,11 +77,11 @@ void GameClientMgr::BindTargetConn(int socket_handle, int conn_instance_id)
 {
     TargetConn* conn = TargetConnMgr::Instance()->GetConnById(conn_instance_id);
     if (conn) {
-        Client* client = GetGameClientBySocket(socket_handle);
+        DownStream* client = GetGameClientBySocket(socket_handle);
         if (client) {
             client->conn = conn;
         } else {
-            client = new Client();
+            client = new DownStream();
             client->socket_handle = socket_handle;
             client->conn = conn;
             socket_hash_[client->socket_handle] = client;
diff --git a/server/wsproxy/gameclientmgr.h b/server/wsproxy/gameclientmgr.h
index f1e8ec4..c237681 100644
--- a/server/wsproxy/gameclientmgr.h
+++ b/server/wsproxy/gameclientmgr.h
@@ -2,7 +2,7 @@
 
 #include <f8/timer.h>
 
-class Client;
+class DownStream;
 class GameClientMgr : public a8::Singleton<GameClientMgr>
 {
  private:
@@ -19,7 +19,7 @@ class GameClientMgr : public a8::Singleton<GameClientMgr>
     void OnTargetServerDisconnect(a8::XParams& param);
     void OnTargetServerConnect(a8::XParams& param);
     #endif
-    Client* GetGameClientBySocket(int sockhande);
+    DownStream* GetGameClientBySocket(int sockhande);
     void BindTargetConn(int socket_handle, int conn_instance_id);
     void AddPendingAccount(const std::string& account_id, int socket_handle, long long req_tick);
 
@@ -29,7 +29,7 @@ private:
 
  private:
     a8::Attacher timer_attacher_;
-    std::map<int, Client*> socket_hash_;
+    std::map<int, DownStream*> socket_hash_;
     #if 0
     std::map<int, std::tuple<std::string, long long, timer_list*>> pending_account_hash_;
     #endif