diff --git a/server/wsproxy/master.cc b/server/wsproxy/master.cc index eda3a1b..cbc7de9 100644 --- a/server/wsproxy/master.cc +++ b/server/wsproxy/master.cc @@ -24,9 +24,7 @@ void Master::Init(int instance_id, const std::string& remote_ip, int remote_port recv_bufflen_ = 0; last_pong_tick = a8::XGetTickCount(); recv_buff_ = (char*) malloc(PACK_MAX * 2); - 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); @@ -77,8 +75,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 efae6a5..1532c2f 100644 --- a/server/wsproxy/upstream.cc +++ b/server/wsproxy/upstream.cc @@ -28,9 +28,7 @@ void UpStream::Init(int instance_id, const std::string& remote_ip, int remote_po recv_bufflen_ = 0; last_pong_tick = a8::XGetTickCount(); recv_buff_ = (char*) malloc(PACK_MAX * 2); - 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); @@ -153,8 +151,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() }); } @@ -163,8 +161,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 ( @@ -185,8 +183,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 ( diff --git a/third_party/a8 b/third_party/a8 index 1e57738..987da1b 160000 --- a/third_party/a8 +++ b/third_party/a8 @@ -1 +1 @@ -Subproject commit 1e577389c8a2870db9ddbf18577bfca24def049b +Subproject commit 987da1b7c3e110bf15c78a28820224761c65fd39