Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-20 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove announce ipv4 ipv6 query params (#4502)

Browse Source
This commit is contained in:
Charles Kerr
2022-12-31 13:13:59 -06:00
committed by GitHub
parent 3777796ce2
commit db38f9aa2c
2 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libtransmission/announcer-http.cc
View File

@@ -379,25 +379,9 @@ void announce_url_new(tr_urlbuf& url, tr_session const* session, tr_announce_req
} }
} }
[[nodiscard]] auto format_ipv4_url_arg(tr_address const& addr)
{
auto buf = std::array<char, TR_ADDRSTRLEN>{};
auto display_name = addr.display_name(std::data(buf), std::size(buf));
return fmt::format("&ipv4={:s}", display_name);
}
[[nodiscard]] auto format_ipv6_url_arg(tr_address const& addr)
{
auto arg = "&ipv6="s;
tr_urlPercentEncode(std::back_inserter(arg), addr.display_name());
return arg;
}
[[nodiscard]] std::string format_ip_arg(std::string_view ip) [[nodiscard]] std::string format_ip_arg(std::string_view ip)
{ {
auto arg = std::string{ "&ip="sv }; return fmt::format("&ip={:s}", ip);
arg += ip;
return arg;
} }
} // namespace tr_tracker_announce_helpers } // namespace tr_tracker_announce_helpers
@@ -452,14 +436,6 @@ void tr_tracker_http_announce(
{ {
options.url += format_ip_arg(session->announceIP()); options.url += format_ip_arg(session->announceIP());
} }
else if (!ipv6_is_any)
{
if (auto public_ipv4 = session->externalIP(); public_ipv4.has_value())
{
options.url += format_ipv4_url_arg(*public_ipv4);
}
options.url += format_ipv6_url_arg(ipv6);
}
d->requests_sent_count = 1; d->requests_sent_count = 1;
do_make_request(""sv, std::move(options)); do_make_request(""sv, std::move(options));
@@ -481,17 +457,10 @@ void tr_tracker_http_announce(
// First try to send the announce via IPv4: // First try to send the announce via IPv4:
auto ipv4_options = options; auto ipv4_options = options;
// Set the "&ipv6=" argument
ipv4_options.url += format_ipv6_url_arg(ipv6);
// Set protocol to IPv4
ipv4_options.ip_proto = tr_web::FetchOptions::IPProtocol::V4; ipv4_options.ip_proto = tr_web::FetchOptions::IPProtocol::V4;
do_make_request("IPv4"sv, std::move(ipv4_options)); do_make_request("IPv4"sv, std::move(ipv4_options));
// Then maybe set the "&ipv4=..." part and try to send via IPv6: // Then try to send via IPv6:
if (auto public_ipv4 = session->externalIP(); public_ipv4.has_value())
{
options.url += format_ipv4_url_arg(*public_ipv4);
}
options.ip_proto = tr_web::FetchOptions::IPProtocol::V6; options.ip_proto = tr_web::FetchOptions::IPProtocol::V6;
do_make_request("IPv6"sv, std::move(options)); do_make_request("IPv6"sv, std::move(options));
} }

5
libtransmission/session.h
View File

@@ -464,11 +464,6 @@ public:
[[nodiscard]] bool useRpcWhitelist() const; [[nodiscard]] bool useRpcWhitelist() const;
[[nodiscard]] constexpr auto externalIP() const noexcept
{
return external_ip_;
}
void setExternalIP(tr_address external_ip) void setExternalIP(tr_address external_ip)
{ {
external_ip_ = external_ip; external_ip_ = external_ip;