Skip to content

Commit

Permalink
Tracker is errored only if all local endpoints fail
Browse files Browse the repository at this point in the history
Closes #11691
  • Loading branch information
sledgehammer999 committed Jan 5, 2020
1 parent 7ceeea8 commit 02a0271
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
12 changes: 11 additions & 1 deletion src/base/bittorrent/torrenthandle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1693,7 +1693,17 @@ void TorrentHandle::handleTrackerErrorAlert(const lt::tracker_error_alert *p)

m_trackerInfos[trackerUrl].lastMessage = message;

m_session->handleTorrentTrackerError(this, trackerUrl);
// Starting with libtorrent 1.2.x each tracker has multiple local endpoints from which
// an announce is attempted. Some endpoints might succeed while others might fail.
// Emit the signal only if all endpoints have failed. TrackerEntry::isWorking() returns
// true if at least one endpoint works.
const QVector<TrackerEntry> trackerList = trackers();
const auto iter = std::find_if(trackerList.cbegin(), trackerList.cend(), [&trackerUrl](const TrackerEntry &entry)
{
return (entry.url() == trackerUrl);
});
if ((iter != trackerList.cend()) && !iter->isWorking())
m_session->handleTorrentTrackerError(this, trackerUrl);
}

void TorrentHandle::handleTorrentCheckedAlert(const lt::torrent_checked_alert *p)
Expand Down
10 changes: 6 additions & 4 deletions src/base/bittorrent/trackerentry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,13 @@ QString TrackerEntry::url() const

bool TrackerEntry::isWorking() const
{
// lt::announce_entry::is_working() returns
// true when the tracker hasn't been tried yet.
#if (LIBTORRENT_VERSION_NUM < 10200)
return nativeEntry().is_working();
return nativeEntry().verified && nativeEntry().is_working();
#else
if (!nativeEntry().verified)
return false;
const auto &endpoints = nativeEntry().endpoints;
return std::any_of(endpoints.begin(), endpoints.end()
, [](const lt::announce_endpoint &endpoint)
Expand All @@ -73,9 +77,7 @@ int TrackerEntry::tier() const

TrackerEntry::Status TrackerEntry::status() const
{
// lt::announce_entry::is_working() returns
// true when the tracker hasn't been tried yet.
if (nativeEntry().verified && isWorking())
if (isWorking())
return Working;

#if (LIBTORRENT_VERSION_NUM < 10200)
Expand Down

0 comments on commit 02a0271

Please sign in to comment.