public/ConnectTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构MultiplexManager，使用字符串ID替代uint32_t，优化TCPClient和TCPServer的客户端管理

Browse Source
This commit is contained in:
Ayndpa
2025-11-19 18:19:14 +08:00
parent 2e0febc3a3
commit dc44cf4df1
7 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tcp/tcp_client.cpp
View File

@@ -1,7 +1,8 @@
#include "tcp_client.h"
#include "../steam/steam_networking_manager.h"
#include <iostream>
TCPClient::TCPClient(const std::string& host, int port) : host_(host), port_(port), connected_(false), disconnected_(false), socket_(std::make_shared<tcp::socket>(io_context_)), work_(boost::asio::make_work_guard(io_context_)), buffer_(1024) {}
TCPClient::TCPClient(const std::string& host, int port, SteamNetworkingManager* manager) : host_(host), port_(port), connected_(false), disconnected_(false), socket_(std::make_shared<tcp::socket>(io_context_)), work_(boost::asio::make_work_guard(io_context_)), buffer_(1024), manager_(manager) {}
TCPClient::~TCPClient() { disconnect(); }
@@ -11,12 +12,15 @@ bool TCPClient::connect() {
auto endpoints = resolver.resolve(host_, std::to_string(port_));
boost::asio::connect(*socket_, endpoints);
connected_ = true;
multiplexManager_ = std::make_unique<MultiplexManager>(manager_->getInterface(), manager_->getConnection(),
io_context_, manager_->getIsHost(), *manager_->getLocalPort());
std::string id = multiplexManager_->addClient(socket_);
clientThread_ = std::thread([this]() {
std::cout << "Client thread started" << std::endl;
io_context_.run();
std::cout << "Client thread stopped" << std::endl;
});
start_read();
start_read(id);
std::cout << "Connected to " << host_ << ":" << port_ << std::endl;
return true;
} catch (const std::exception& e) {
@@ -44,6 +48,7 @@ void TCPClient::disconnect() {
} catch (const std::exception& e) {
std::cerr << "Error closing socket: " << e.what() << std::endl;
}
multiplexManager_.reset();
}
void TCPClient::send(const std::string& message) {
@@ -69,32 +74,39 @@ void TCPClient::setReceiveCallback(std::function<void(const char*, size_t)> call
receiveCallbackBytes_ = callback;
}
void TCPClient::setDisconnectCallback(std::function<void()> callback) {
disconnectCallback_ = callback;
}
void TCPClient::start_read() {
socket_->async_read_some(boost::asio::buffer(buffer_), [this](const boost::system::error_code& error, std::size_t bytes_transferred) {
handle_read(error, bytes_transferred);
void TCPClient::start_read(std::string id) {
socket_->async_read_some(boost::asio::buffer(buffer_), [this, id](const boost::system::error_code& error, std::size_t bytes_transferred) {
handle_read(id, error, bytes_transferred);
});
}
void TCPClient::handle_read(const boost::system::error_code& error, std::size_t bytes_transferred) {
void TCPClient::handle_read(std::string id, const boost::system::error_code& error, std::size_t bytes_transferred) {
if (!error) {
// std::cout << "Received " << bytes_transferred << " bytes" << std::endl;
std::cout << "Received " << bytes_transferred << " bytes from TCP server" << std::endl;
if (manager_->isConnected()) {
multiplexManager_->sendTunnelPacket(id, buffer_.data(), bytes_transferred, 0);
} else {
std::cout << "Not connected to Steam, skipping forward" << std::endl;
}
if (receiveCallbackBytes_) {
receiveCallbackBytes_(buffer_.data(), bytes_transferred);
} else if (receiveCallback_) {
std::string message(buffer_.data(), bytes_transferred);
receiveCallback_(message);
}
start_read();
start_read(id);
} else {
if (error == boost::asio::error::eof) {
std::cout << "Connection closed by peer" << std::endl;
} else {
std::cerr << "Read failed: " << error.message() << std::endl;
}
// Send disconnect packet
if (manager_->isConnected()) {
multiplexManager_->sendTunnelPacket(id, nullptr, 0, 1);
}
// Remove client
multiplexManager_->removeClient(id);
if (disconnectCallback_) {
disconnectCallback_();
}