d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-12 15:57:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11733 from sledgehammer999/tracker_error_count

Browse Source 
Tracker is errored only if all local endpoints fail
This commit is contained in:
sledgehammer999 2020-01-08 04:24:08 +02:00 committed by GitHub
commit 45ed31fddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/base/bittorrent/torrenthandle.cpp
View File

@ -1693,7 +1693,17 @@ void TorrentHandle::handleTrackerErrorAlert(const lt::tracker_error_alert *p)
m_trackerInfos[trackerUrl].lastMessage = message; 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) void TorrentHandle::handleTorrentCheckedAlert(const lt::torrent_checked_alert *p)

10
src/base/bittorrent/trackerentry.cpp
View File

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