From 7f0aebeac8894d7cb873758ee88d412e4b4ea68b Mon Sep 17 00:00:00 2001 From: azw Date: Mon, 8 May 2023 03:06:50 +0000 Subject: [PATCH] 1 --- server/wsproxy/master.cc | 8 +++----- server/wsproxy/upstream.cc | 16 +++++++--------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/server/wsproxy/master.cc b/server/wsproxy/master.cc index 1eafb29..5e38ec2 100644 --- a/server/wsproxy/master.cc +++ b/server/wsproxy/master.cc @@ -21,9 +21,7 @@ void Master::Init(int instance_id, const std::string& remote_ip, int remote_port recv_bufflen_ = 0; last_pong_tick = a8::XGetTickCount(); - tcp_client_ = std::make_shared(); - tcp_client_->remote_address = remote_ip; - tcp_client_->remote_port = remote_port; + tcp_client_ = std::make_shared(remote_ip, remote_port); tcp_client_->on_error = std::bind(&Master::on_error, this, std::placeholders::_1, std::placeholders::_2); tcp_client_->on_connect = std::bind(&Master::on_connect, this, std::placeholders::_1); tcp_client_->on_disconnect = std::bind(&Master::on_disconnect, this, std::placeholders::_1); @@ -72,8 +70,8 @@ void Master::on_error(a8::TcpClient* sender, int errorId) f8::UdpLog::Instance()->Error("Master errorid=%d remote_ip:%s remote_port:%d", { errorId, - sender->remote_address, - sender->remote_port + sender->GetRemoteAddress(), + sender->GetRemotePort() }); } diff --git a/server/wsproxy/upstream.cc b/server/wsproxy/upstream.cc index f6bdbab..c4b080a 100644 --- a/server/wsproxy/upstream.cc +++ b/server/wsproxy/upstream.cc @@ -25,9 +25,7 @@ void UpStream::Init(int instance_id, const std::string& remote_ip, int remote_po recv_bufflen_ = 0; last_pong_tick = a8::XGetTickCount(); - tcp_client_ = std::make_shared(); - tcp_client_->remote_address = remote_ip; - tcp_client_->remote_port = remote_port; + tcp_client_ = std::make_shared(remote_ip, remote_port); tcp_client_->on_error = std::bind(&UpStream::on_error, this, std::placeholders::_1, std::placeholders::_2); tcp_client_->on_connect = std::bind(&UpStream::on_connect, this, std::placeholders::_1); tcp_client_->on_disconnect = std::bind(&UpStream::on_disconnect, this, std::placeholders::_1); @@ -147,8 +145,8 @@ void UpStream::on_error(a8::TcpClient* sender, int errorId) f8::UdpLog::Instance()->Error("target server errorid=%d remote_ip:%s remote_port:%d", { errorId, - sender->remote_address, - sender->remote_port + sender->GetRemoteAddress(), + sender->GetRemotePort() }); } @@ -157,8 +155,8 @@ void UpStream::on_connect(a8::TcpClient* sender) recv_bufflen_ = 0; f8::UdpLog::Instance()->Info("target server connected remote_ip:%s remote_port:%d", { - sender->remote_address, - sender->remote_port + sender->GetRemoteAddress(), + sender->GetRemotePort() }); f8::MsgQueue::Instance()->PostMsg ( @@ -179,8 +177,8 @@ void UpStream::on_disconnect(a8::TcpClient* sender) "remote_ip:%s remote_port:%d", { instance_id, - sender->remote_address, - sender->remote_port + sender->GetRemoteAddress(), + sender->GetRemotePort() }); f8::MsgQueue::Instance()->PostMsg (