server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
azw 2023-09-04 02:31:21 +00:00
parent 7eb242f5b8
commit 676965d292
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/wsproxy/master.cc
View File

@ -24,9 +24,7 @@ void Master::Init(int instance_id, const std::string& remote_ip, int remote_port
recv_bufflen_ = 0; recv_bufflen_ = 0;
last_pong_tick = a8::XGetTickCount(); last_pong_tick = a8::XGetTickCount();
recv_buff_ = (char*) malloc(PACK_MAX * 2); recv_buff_ = (char*) malloc(PACK_MAX * 2);
tcp_client_ = std::make_shared<a8::TcpClient>(); tcp_client_ = std::make_shared<a8::TcpClient>(remote_ip, remote_port);
tcp_client_->remote_address = remote_ip;
tcp_client_->remote_port = remote_port;
tcp_client_->on_error = std::bind(&Master::on_error, this, std::placeholders::_1, std::placeholders::_2); 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_connect = std::bind(&Master::on_connect, this, std::placeholders::_1);
tcp_client_->on_disconnect = std::bind(&Master::on_disconnect, 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", f8::UdpLog::Instance()->Error("Master errorid=%d remote_ip:%s remote_port:%d",
{ {
errorId, errorId,
sender->remote_address, sender->GetRemoteAddress(),
sender->remote_port sender->GetRemotePort()
}); });
} }

16
server/wsproxy/upstream.cc
View File

@ -28,9 +28,7 @@ void UpStream::Init(int instance_id, const std::string& remote_ip, int remote_po
recv_bufflen_ = 0; recv_bufflen_ = 0;
last_pong_tick = a8::XGetTickCount(); last_pong_tick = a8::XGetTickCount();
recv_buff_ = (char*) malloc(PACK_MAX * 2); recv_buff_ = (char*) malloc(PACK_MAX * 2);
tcp_client_ = std::make_shared<a8::TcpClient>(); tcp_client_ = std::make_shared<a8::TcpClient>(remote_ip, remote_port);
tcp_client_->remote_address = remote_ip;
tcp_client_->remote_port = remote_port;
tcp_client_->on_error = std::bind(&UpStream::on_error, this, std::placeholders::_1, std::placeholders::_2); 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_connect = std::bind(&UpStream::on_connect, this, std::placeholders::_1);
tcp_client_->on_disconnect = std::bind(&UpStream::on_disconnect, 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", f8::UdpLog::Instance()->Error("target server errorid=%d remote_ip:%s remote_port:%d",
{ {
errorId, errorId,
sender->remote_address, sender->GetRemoteAddress(),
sender->remote_port sender->GetRemotePort()
}); });
} }
@ -163,8 +161,8 @@ void UpStream::on_connect(a8::TcpClient* sender)
recv_bufflen_ = 0; recv_bufflen_ = 0;
f8::UdpLog::Instance()->Info("target server connected remote_ip:%s remote_port:%d", f8::UdpLog::Instance()->Info("target server connected remote_ip:%s remote_port:%d",
{ {
sender->remote_address, sender->GetRemoteAddress(),
sender->remote_port sender->GetRemotePort()
}); });
f8::MsgQueue::Instance()->PostMsg f8::MsgQueue::Instance()->PostMsg
( (
@ -185,8 +183,8 @@ void UpStream::on_disconnect(a8::TcpClient* sender)
"remote_ip:%s remote_port:%d", "remote_ip:%s remote_port:%d",
{ {
instance_id, instance_id,
sender->remote_address, sender->GetRemoteAddress(),
sender->remote_port sender->GetRemotePort()
}); });
f8::MsgQueue::Instance()->PostMsg f8::MsgQueue::Instance()->PostMsg
( (

2
third_party/a8 vendored

@ -1 +1 @@
Subproject commit 1e577389c8a2870db9ddbf18577bfca24def049b Subproject commit 987da1b7c3e110bf15c78a28820224761c65fd39