tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix TransparentProxy::Callback.

Browse Source
This commit is contained in:
levlam 2021-10-22 19:59:15 +03:00
parent 03c6d53951
commit 0c1469f7c6
7 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
td/mtproto/RawConnection.cpp
View File

@ -15,7 +15,6 @@
#include "td/net/DarwinHttp.h" #include "td/net/DarwinHttp.h"
#endif #endif
#include "td/utils/BufferedFd.h"
#include "td/utils/format.h" #include "td/utils/format.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
#include "td/utils/misc.h" #include "td/utils/misc.h"
@ -35,8 +34,9 @@ namespace mtproto {
class RawConnectionDefault final : public RawConnection { class RawConnectionDefault final : public RawConnection {
public: public:
RawConnectionDefault(SocketFd socket_fd, TransportType transport_type, unique_ptr<StatsCallback> stats_callback) RawConnectionDefault(BufferedFd<SocketFd> buffered_socket_fd, TransportType transport_type,
: socket_fd_(std::move(socket_fd)) unique_ptr<StatsCallback> stats_callback)
: socket_fd_(std::move(buffered_socket_fd))
, transport_(create_transport(std::move(transport_type))) , transport_(create_transport(std::move(transport_type)))
, stats_callback_(std::move(stats_callback)) { , stats_callback_(std::move(stats_callback)) {
transport_->init(&socket_fd_.input_buffer(), &socket_fd_.output_buffer()); transport_->init(&socket_fd_.input_buffer(), &socket_fd_.output_buffer());
@ -450,12 +450,13 @@ class RawConnectionHttp final : public RawConnection {
}; };
#endif #endif
unique_ptr<RawConnection> RawConnection::create(IPAddress ip_address, SocketFd socket_fd, TransportType transport_type, unique_ptr<RawConnection> RawConnection::create(IPAddress ip_address, BufferedFd<SocketFd> buffered_socket_fd,
TransportType transport_type,
unique_ptr<StatsCallback> stats_callback) { unique_ptr<StatsCallback> stats_callback) {
#if TD_DARWIN_WATCH_OS #if TD_DARWIN_WATCH_OS
return td::make_unique<RawConnectionHttp>(std::move(ip_address), std::move(stats_callback)); return td::make_unique<RawConnectionHttp>(std::move(ip_address), std::move(stats_callback));
#else #else
return td::make_unique<RawConnectionDefault>(std::move(socket_fd), std::move(transport_type), return td::make_unique<RawConnectionDefault>(std::move(buffered_socket_fd), std::move(transport_type),
std::move(stats_callback)); std::move(stats_callback));
#endif #endif
} }

5
td/mtproto/RawConnection.h
View File

@ -11,6 +11,7 @@
#include "td/mtproto/TransportType.h" #include "td/mtproto/TransportType.h"
#include "td/utils/buffer.h" #include "td/utils/buffer.h"
#include "td/utils/BufferedFd.h"
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/port/detail/PollableFd.h" #include "td/utils/port/detail/PollableFd.h"
#include "td/utils/port/IPAddress.h" #include "td/utils/port/IPAddress.h"
@ -40,8 +41,8 @@ class RawConnection {
RawConnection &operator=(const RawConnection &) = delete; RawConnection &operator=(const RawConnection &) = delete;
virtual ~RawConnection() = default; virtual ~RawConnection() = default;
static unique_ptr<RawConnection> create(IPAddress ip_address, SocketFd socket_fd, TransportType transport_type, static unique_ptr<RawConnection> create(IPAddress ip_address, BufferedFd<SocketFd> buffered_socket_fd,
unique_ptr<StatsCallback> stats_callback); TransportType transport_type, unique_ptr<StatsCallback> stats_callback);
virtual void set_connection_token(ConnectionManager::ConnectionToken connection_token) = 0; virtual void set_connection_token(ConnectionManager::ConnectionToken connection_token) = 0;

2
td/telegram/Td.cpp
View File

@ -559,7 +559,7 @@ class TestProxyRequest final : public RequestOnceActor {
auto handshake = make_unique<mtproto::AuthKeyHandshake>(dc_id_, 3600); auto handshake = make_unique<mtproto::AuthKeyHandshake>(dc_id_, 3600);
auto data = r_data.move_as_ok(); auto data = r_data.move_as_ok();
auto raw_connection = auto raw_connection =
mtproto::RawConnection::create(data.ip_address, std::move(data.socket_fd), get_transport(), nullptr); mtproto::RawConnection::create(data.ip_address, std::move(data.buffered_socket_fd), get_transport(), nullptr);
child_ = create_actor<mtproto::HandshakeActor>( child_ = create_actor<mtproto::HandshakeActor>(
"HandshakeActor", std::move(handshake), std::move(raw_connection), make_unique<HandshakeContext>(), 10.0, "HandshakeActor", std::move(handshake), std::move(raw_connection), make_unique<HandshakeContext>(), 10.0,
PromiseCreator::lambda([actor_id = actor_id(this)](Result<unique_ptr<mtproto::RawConnection>> raw_connection) { PromiseCreator::lambda([actor_id = actor_id(this)](Result<unique_ptr<mtproto::RawConnection>> raw_connection) {

44
td/telegram/net/ConnectionCreator.cpp
View File

@ -328,12 +328,12 @@ void ConnectionCreator::ping_proxy(int32 proxy_id, Promise<double> promise) {
continue; continue;
} }
ping_proxy_socket_fd(std::move(ip_address), r_socket_fd.move_as_ok(), r_transport_type.move_as_ok(), ping_proxy_buffered_socket_fd(std::move(ip_address), BufferedFd<SocketFd>(r_socket_fd.move_as_ok()),
PSTRING() << info.option->get_ip_address(), r_transport_type.move_as_ok(), PSTRING() << info.option->get_ip_address(),
PromiseCreator::lambda([actor_id = actor_id(this), token](Result<double> result) { PromiseCreator::lambda([actor_id = actor_id(this), token](Result<double> result) {
send_closure(actor_id, &ConnectionCreator::on_ping_main_dc_result, token, send_closure(actor_id, &ConnectionCreator::on_ping_main_dc_result, token,
std::move(result)); std::move(result));
})); }));
} }
return; return;
} }
@ -375,8 +375,9 @@ void ConnectionCreator::ping_proxy_resolved(int32 proxy_id, IPAddress ip_address
if (r_connection_data.is_error()) { if (r_connection_data.is_error()) {
return promise.set_error(Status::Error(400, r_connection_data.error().public_message())); return promise.set_error(Status::Error(400, r_connection_data.error().public_message()));
} }
send_closure(actor_id, &ConnectionCreator::ping_proxy_socket_fd, ip_address, auto connection_data = r_connection_data.move_as_ok();
r_connection_data.move_as_ok().socket_fd, std::move(transport_type), std::move(debug_str), send_closure(actor_id, &ConnectionCreator::ping_proxy_buffered_socket_fd, ip_address,
std::move(connection_data.buffered_socket_fd), std::move(transport_type), std::move(debug_str),
std::move(promise)); std::move(promise));
}); });
CHECK(proxy.use_proxy()); CHECK(proxy.use_proxy());
@ -389,12 +390,12 @@ void ConnectionCreator::ping_proxy_resolved(int32 proxy_id, IPAddress ip_address
} }
} }
void ConnectionCreator::ping_proxy_socket_fd(IPAddress ip_address, SocketFd socket_fd, void ConnectionCreator::ping_proxy_buffered_socket_fd(IPAddress ip_address, BufferedFd<SocketFd> buffered_socket_fd,
mtproto::TransportType transport_type, string debug_str, mtproto::TransportType transport_type, string debug_str,
Promise<double> promise) { Promise<double> promise) {
auto token = next_token(); auto token = next_token();
auto raw_connection = auto raw_connection =
mtproto::RawConnection::create(ip_address, std::move(socket_fd), std::move(transport_type), nullptr); mtproto::RawConnection::create(ip_address, std::move(buffered_socket_fd), std::move(transport_type), nullptr);
children_[token] = { children_[token] = {
false, create_ping_actor(debug_str, std::move(raw_connection), nullptr, false, create_ping_actor(debug_str, std::move(raw_connection), nullptr,
PromiseCreator::lambda([promise = std::move(promise)]( PromiseCreator::lambda([promise = std::move(promise)](
@ -651,8 +652,9 @@ void ConnectionCreator::request_raw_connection_by_ip(IPAddress ip_address, mtpro
if (r_connection_data.is_error()) { if (r_connection_data.is_error()) {
return promise.set_error(Status::Error(400, r_connection_data.error().public_message())); return promise.set_error(Status::Error(400, r_connection_data.error().public_message()));
} }
auto raw_connection = auto connection_data = r_connection_data.move_as_ok();
mtproto::RawConnection::create(ip_address, r_connection_data.move_as_ok().socket_fd, transport_type, nullptr); auto raw_connection = mtproto::RawConnection::create(ip_address, std::move(connection_data.buffered_socket_fd),
transport_type, nullptr);
raw_connection->extra().extra = network_generation; raw_connection->extra().extra = network_generation;
promise.set_value(std::move(raw_connection)); promise.set_value(std::move(raw_connection));
}); });
@ -754,19 +756,19 @@ ActorOwn<> ConnectionCreator::prepare_connection(IPAddress ip_address, SocketFd
, use_connection_token_(use_connection_token) , use_connection_token_(use_connection_token)
, was_connected_(was_connected) { , was_connected_(was_connected) {
} }
void set_result(Result<SocketFd> result) final { void set_result(Result<BufferedFd<SocketFd>> r_buffered_socket_fd) final {
if (result.is_error()) { if (r_buffered_socket_fd.is_error()) {
if (use_connection_token_) { if (use_connection_token_) {
connection_token_ = mtproto::ConnectionManager::ConnectionToken(); connection_token_ = mtproto::ConnectionManager::ConnectionToken();
} }
if (was_connected_ && stats_callback_) { if (was_connected_ && stats_callback_) {
stats_callback_->on_error(); stats_callback_->on_error();
} }
promise_.set_error(Status::Error(400, result.error().public_message())); promise_.set_error(Status::Error(400, r_buffered_socket_fd.error().public_message()));
} else { } else {
ConnectionData data; ConnectionData data;
data.ip_address = ip_address_; data.ip_address = ip_address_;
data.socket_fd = result.move_as_ok(); data.buffered_socket_fd = r_buffered_socket_fd.move_as_ok();
data.connection_token = std::move(connection_token_); data.connection_token = std::move(connection_token_);
data.stats_callback = std::move(stats_callback_); data.stats_callback = std::move(stats_callback_);
promise_.set_value(std::move(data)); promise_.set_value(std::move(data));
@ -785,7 +787,7 @@ ActorOwn<> ConnectionCreator::prepare_connection(IPAddress ip_address, SocketFd
mtproto::ConnectionManager::ConnectionToken connection_token_; mtproto::ConnectionManager::ConnectionToken connection_token_;
IPAddress ip_address_; IPAddress ip_address_;
unique_ptr<mtproto::RawConnection::StatsCallback> stats_callback_; unique_ptr<mtproto::RawConnection::StatsCallback> stats_callback_;
bool use_connection_token_; bool use_connection_token_{false};
bool was_connected_{false}; bool was_connected_{false};
}; };
VLOG(connections) << "Start " VLOG(connections) << "Start "
@ -814,7 +816,7 @@ ActorOwn<> ConnectionCreator::prepare_connection(IPAddress ip_address, SocketFd
ConnectionData data; ConnectionData data;
data.ip_address = ip_address; data.ip_address = ip_address;
data.socket_fd = std::move(socket_fd); data.buffered_socket_fd = BufferedFd<SocketFd>(std::move(socket_fd));
data.stats_callback = std::move(stats_callback); data.stats_callback = std::move(stats_callback);
promise.set_result(std::move(data)); promise.set_result(std::move(data));
return {}; return {};
@ -991,7 +993,7 @@ void ConnectionCreator::client_create_raw_connection(Result<ConnectionData> r_co
auto connection_data = r_connection_data.move_as_ok(); auto connection_data = r_connection_data.move_as_ok();
auto raw_connection = auto raw_connection =
mtproto::RawConnection::create(connection_data.ip_address, std::move(connection_data.socket_fd), mtproto::RawConnection::create(connection_data.ip_address, std::move(connection_data.buffered_socket_fd),
std::move(transport_type), std::move(connection_data.stats_callback)); std::move(transport_type), std::move(connection_data.stats_callback));
raw_connection->set_connection_token(std::move(connection_data.connection_token)); raw_connection->set_connection_token(std::move(connection_data.connection_token));

7
td/telegram/net/ConnectionCreator.h
View File

@ -25,6 +25,7 @@
#include "td/actor/PromiseFuture.h" #include "td/actor/PromiseFuture.h"
#include "td/actor/SignalSlot.h" #include "td/actor/SignalSlot.h"
#include "td/utils/BufferedFd.h"
#include "td/utils/common.h" #include "td/utils/common.h"
#include "td/utils/FloodControlStrict.h" #include "td/utils/FloodControlStrict.h"
#include "td/utils/logging.h" #include "td/utils/logging.h"
@ -81,7 +82,7 @@ class ConnectionCreator final : public NetQueryCallback {
struct ConnectionData { struct ConnectionData {
IPAddress ip_address; IPAddress ip_address;
SocketFd socket_fd; BufferedFd<SocketFd> buffered_socket_fd;
mtproto::ConnectionManager::ConnectionToken connection_token; mtproto::ConnectionManager::ConnectionToken connection_token;
unique_ptr<mtproto::RawConnection::StatsCallback> stats_callback; unique_ptr<mtproto::RawConnection::StatsCallback> stats_callback;
}; };
@ -246,8 +247,8 @@ class ConnectionCreator final : public NetQueryCallback {
void ping_proxy_resolved(int32 proxy_id, IPAddress ip_address, Promise<double> promise); void ping_proxy_resolved(int32 proxy_id, IPAddress ip_address, Promise<double> promise);
void ping_proxy_socket_fd(IPAddress ip_address, SocketFd socket_fd, mtproto::TransportType transport_type, void ping_proxy_buffered_socket_fd(IPAddress ip_address, BufferedFd<SocketFd> buffered_socket_fd,
string debug_str, Promise<double> promise); mtproto::TransportType transport_type, string debug_str, Promise<double> promise);
void on_ping_main_dc_result(uint64 token, Result<double> result); void on_ping_main_dc_result(uint64 token, Result<double> result);
}; };

2
tdnet/td/net/TransparentProxy.h
View File

@ -28,7 +28,7 @@ class TransparentProxy : public Actor {
Callback &operator=(const Callback &) = delete; Callback &operator=(const Callback &) = delete;
virtual ~Callback() = default; virtual ~Callback() = default;
virtual void set_result(Result<SocketFd>) = 0; virtual void set_result(Result<BufferedFd<SocketFd>> r_buffered_socket_fd) = 0;
virtual void on_connected() = 0; virtual void on_connected() = 0;
}; };

18
test/mtproto.cpp
View File

@ -217,7 +217,7 @@ class TestPingActor final : public Actor {
} }
ping_connection_ = mtproto::PingConnection::create_req_pq( ping_connection_ = mtproto::PingConnection::create_req_pq(
mtproto::RawConnection::create(ip_address_, r_socket.move_as_ok(), mtproto::RawConnection::create(ip_address_, BufferedFd<SocketFd>(r_socket.move_as_ok()),
mtproto::TransportType{mtproto::TransportType::Tcp, 0, mtproto::ProxySecret()}, mtproto::TransportType{mtproto::TransportType::Tcp, 0, mtproto::ProxySecret()},
nullptr), nullptr),
3); 3);
@ -339,7 +339,7 @@ class HandshakeTestActor final : public Actor {
} }
raw_connection_ = mtproto::RawConnection::create( raw_connection_ = mtproto::RawConnection::create(
ip_address, r_socket.move_as_ok(), ip_address, BufferedFd<SocketFd>(r_socket.move_as_ok()),
mtproto::TransportType{mtproto::TransportType::Tcp, 0, mtproto::ProxySecret()}, nullptr); mtproto::TransportType{mtproto::TransportType::Tcp, 0, mtproto::ProxySecret()}, nullptr);
} }
if (!wait_for_handshake_ && !handshake_) { if (!wait_for_handshake_ && !handshake_) {
@ -438,22 +438,22 @@ RegisterTest<Mtproto_handshake> mtproto_handshake("Mtproto_handshake");
class Socks5TestActor final : public Actor { class Socks5TestActor final : public Actor {
public: public:
void start_up() final { void start_up() final {
auto promise = PromiseCreator::lambda([actor_id = actor_id(this)](Result<SocketFd> res) { auto promise = PromiseCreator::lambda([actor_id = actor_id(this)](Result<BufferedFd<SocketFd>> res) {
send_closure(actor_id, &Socks5TestActor::on_result, std::move(res), false); send_closure(actor_id, &Socks5TestActor::on_result, std::move(res), false);
}); });
class Callback final : public TransparentProxy::Callback { class Callback final : public TransparentProxy::Callback {
public: public:
explicit Callback(Promise<SocketFd> promise) : promise_(std::move(promise)) { explicit Callback(Promise<BufferedFd<SocketFd>> promise) : promise_(std::move(promise)) {
} }
void set_result(Result<SocketFd> result) final { void set_result(Result<BufferedFd<SocketFd>> result) final {
promise_.set_result(std::move(result)); promise_.set_result(std::move(result));
} }
void on_connected() final { void on_connected() final {
} }
private: private:
Promise<SocketFd> promise_; Promise<BufferedFd<SocketFd>> promise_;
}; };
IPAddress socks5_ip; IPAddress socks5_ip;
@ -470,7 +470,7 @@ class Socks5TestActor final : public Actor {
} }
private: private:
void on_result(Result<SocketFd> res, bool dummy) { void on_result(Result<BufferedFd<SocketFd>> res, bool dummy) {
res.ensure(); res.ensure();
Scheduler::instance()->finish(); Scheduler::instance()->finish();
} }
@ -545,7 +545,7 @@ class FastPingTestActor final : public Actor {
} }
auto raw_connection = mtproto::RawConnection::create( auto raw_connection = mtproto::RawConnection::create(
ip_address, r_socket.move_as_ok(), ip_address, BufferedFd<SocketFd>(r_socket.move_as_ok()),
mtproto::TransportType{mtproto::TransportType::Tcp, 0, mtproto::ProxySecret()}, nullptr); mtproto::TransportType{mtproto::TransportType::Tcp, 0, mtproto::ProxySecret()}, nullptr);
auto handshake = make_unique<mtproto::AuthKeyHandshake>(get_default_dc_id(), 60 * 100 /*temp*/); auto handshake = make_unique<mtproto::AuthKeyHandshake>(get_default_dc_id(), 60 * 100 /*temp*/);
create_actor<mtproto::HandshakeActor>( create_actor<mtproto::HandshakeActor>(
@ -676,7 +676,7 @@ TEST(Mtproto, TlsTransport) {
void start_up() final { void start_up() final {
class Callback final : public TransparentProxy::Callback { class Callback final : public TransparentProxy::Callback {
public: public:
void set_result(Result<SocketFd> result) final { void set_result(Result<BufferedFd<SocketFd>> result) final {
if (result.is_ok()) { if (result.is_ok()) {
LOG(ERROR) << "Unexpectedly succeeded to connect to MTProto proxy"; LOG(ERROR) << "Unexpectedly succeeded to connect to MTProto proxy";
} else if (result.error().message() != "Response hash mismatch") { } else if (result.error().message() != "Response hash mismatch") {