andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

ConnectionCreator::get_transport_type.

Browse Source 
GitOrigin-RevId: e73fa95b64f5cd36640ab574b3d0b30823ece001
This commit is contained in:
levlam 2018-06-04 01:17:59 +03:00
parent 13f17714fc
commit d774b6612f
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,42 +680,53 @@ void ConnectionCreator::request_raw_connection_by_ip(IPAddress ip_address,
promise.set_value(std::move(raw_connection)); promise.set_value(std::move(raw_connection));
} }
Result<SocketFd> ConnectionCreator::find_connection(const ConnectionCreator::ProxyInfo &proxy, DcId dc_id, Result<mtproto::TransportType> ConnectionCreator::get_transport_type(const ProxyInfo &proxy,
bool allow_media_only, FindConnectionExtra &extra) { const DcOptionsSet::ConnectionInfo &info) {
extra.debug_str = PSTRING() << "Failed to find valid IP for " << dc_id; int32 int_dc_id = info.option->get_dc_id().get_raw_id();
TRY_RESULT(info, dc_options_set_.find_connection(dc_id, allow_media_only, proxy.use_proxy()));
extra.stat = info.stat;
int32 int_dc_id = dc_id.get_raw_id();
if (G()->is_test_dc()) { if (G()->is_test_dc()) {
int_dc_id += 10000; int_dc_id += 10000;
} }
int16 raw_dc_id = narrow_cast<int16>(info.option->is_media_only() ? -int_dc_id : int_dc_id); int16 raw_dc_id = narrow_cast<int16>(info.option->is_media_only() ? -int_dc_id : int_dc_id);
if (proxy.use_mtproto_proxy()) { if (proxy.use_mtproto_proxy()) {
extra.debug_str = PSTRING() << "Mtproto " << proxy.ip_address() << " to DC" << raw_dc_id;
TRY_RESULT(secret, hex_decode(proxy.proxy().secret())); TRY_RESULT(secret, hex_decode(proxy.proxy().secret()));
extra.transport_type = {mtproto::TransportType::ObfuscatedTcp, raw_dc_id, std::move(secret)}; return mtproto::TransportType{mtproto::TransportType::ObfuscatedTcp, raw_dc_id, std::move(secret)};
}
if (info.use_http) {
return mtproto::TransportType{mtproto::TransportType::Http, 0, ""};
} else {
return mtproto::TransportType{mtproto::TransportType::ObfuscatedTcp, raw_dc_id, info.option->get_secret().str()};
}
}
Result<SocketFd> ConnectionCreator::find_connection(const ProxyInfo &proxy, DcId dc_id, bool allow_media_only,
FindConnectionExtra &extra) {
extra.debug_str = PSTRING() << "Failed to find valid IP for " << dc_id;
TRY_RESULT(info, dc_options_set_.find_connection(dc_id, allow_media_only, proxy.use_proxy()));
extra.stat = info.stat;
TRY_RESULT(transport_type, get_transport_type(proxy, info));
extra.transport_type = std::move(transport_type);
extra.debug_str = PSTRING() << " to " << (info.option->is_media_only() ? " MEDIA" : "") << dc_id
<< (info.use_http ? " over HTTP" : "");
if (proxy.use_mtproto_proxy()) {
extra.debug_str = PSTRING() << "Mtproto " << proxy.ip_address() << extra.debug_str;
LOG(INFO) << "Create: " << extra.debug_str; LOG(INFO) << "Create: " << extra.debug_str;
return SocketFd::open(proxy.ip_address()); return SocketFd::open(proxy.ip_address());
} }
if (info.use_http) {
extra.transport_type = {mtproto::TransportType::Http, 0, ""};
} else {
extra.transport_type = {mtproto::TransportType::ObfuscatedTcp, raw_dc_id, info.option->get_secret().str()};
}
extra.check_mode |= info.should_check; extra.check_mode |= info.should_check;
if (proxy.use_socks5_proxy()) { if (proxy.use_socks5_proxy()) {
extra.mtproto_ip = info.option->get_ip_address(); extra.mtproto_ip = info.option->get_ip_address();
extra.debug_str = PSTRING() << "Socks5 " << proxy.ip_address() << " --> " << extra.mtproto_ip << " " << dc_id; extra.debug_str = PSTRING() << "Socks5 " << proxy.ip_address() << " --> " << extra.mtproto_ip << extra.debug_str;
LOG(INFO) << "Create: " << extra.debug_str; LOG(INFO) << "Create: " << extra.debug_str;
return SocketFd::open(proxy.ip_address()); return SocketFd::open(proxy.ip_address());
} else { } else {
extra.debug_str = PSTRING() << info.option->get_ip_address() << " " << dc_id << (info.use_http ? " HTTP" : "") extra.debug_str = PSTRING() << info.option->get_ip_address() << extra.debug_str;
<< (info.option->is_media_only() ? " MEDIA" : "");
LOG(INFO) << "Create: " << extra.debug_str; LOG(INFO) << "Create: " << extra.debug_str;
return SocketFd::open(info.option->get_ip_address()); return SocketFd::open(info.option->get_ip_address());
} }

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

@ -285,9 +285,15 @@ class ConnectionCreator : public NetQueryCallback {
bool check_mode{false}; bool check_mode{false};
}; };
class ProxyInfo; class ProxyInfo;
static Result<mtproto::TransportType> get_transport_type(const ProxyInfo &proxy,
const DcOptionsSet::ConnectionInfo &info);
Result<SocketFd> find_connection(const ProxyInfo &proxy, DcId dc_id, bool allow_media_only, Result<SocketFd> find_connection(const ProxyInfo &proxy, DcId dc_id, bool allow_media_only,
FindConnectionExtra &extra); FindConnectionExtra &extra);
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(SocketFd socket_fd, mtproto::TransportType transport_type, Promise<double> promise); void ping_proxy_socket_fd(SocketFd socket_fd, mtproto::TransportType transport_type, Promise<double> promise);
}; };

2
td/telegram/net/SessionProxy.cpp
View File

@ -148,7 +148,7 @@ void SessionProxy::open_session(bool force) {
if (G()->is_test_dc()) { if (G()->is_test_dc()) {
int_dc_id += 10000; int_dc_id += 10000;
} }
if (is_media_) { if (allow_media_only_ && !is_cdn_) {
int_dc_id = -int_dc_id; int_dc_id = -int_dc_id;
} }
session_ = create_actor<Session>( session_ = create_actor<Session>(