d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Improve tracker error handling

Browse Source 
* Improve tracker error handling
* Fix typo in function name

PR  #16298.
This commit is contained in:
Prince Gupta 2022-01-30 11:26:31 +05:30 committed by GitHub
parent 1d4071d6d8
commit 414361a3db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/base/bittorrent/torrentimpl.cpp
View File

@ -78,10 +78,10 @@ namespace
} }
#ifdef QBT_USES_LIBTORRENT2 #ifdef QBT_USES_LIBTORRENT2
TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry TrackerEntry fromNativeAnnounceEntry(const lt::announce_entry &nativeEntry
, const lt::info_hash_t &hashes, const QMap<lt::tcp::endpoint, int> &trackerPeerCounts) , const lt::info_hash_t &hashes, const QMap<lt::tcp::endpoint, int> &trackerPeerCounts)
#else #else
TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry TrackerEntry fromNativeAnnounceEntry(const lt::announce_entry &nativeEntry
, const QMap<lt::tcp::endpoint, int> &trackerPeerCounts) , const QMap<lt::tcp::endpoint, int> &trackerPeerCounts)
#endif #endif
{ {
@ -509,9 +509,9 @@ QVector<TrackerEntry> TorrentImpl::trackers() const
{ {
const QString trackerURL = QString::fromStdString(tracker.url); const QString trackerURL = QString::fromStdString(tracker.url);
#ifdef QBT_USES_LIBTORRENT2 #ifdef QBT_USES_LIBTORRENT2
entries << fromNativeAnnouncerEntry(tracker, m_nativeHandle.info_hashes(), m_trackerPeerCounts[trackerURL]); entries << fromNativeAnnounceEntry(tracker, m_nativeHandle.info_hashes(), m_trackerPeerCounts[trackerURL]);
#else #else
entries << fromNativeAnnouncerEntry(tracker, m_trackerPeerCounts[trackerURL]); entries << fromNativeAnnounceEntry(tracker, m_trackerPeerCounts[trackerURL]);
#endif #endif
} }
@ -1667,18 +1667,28 @@ void TorrentImpl::handleTrackerWarningAlert(const lt::tracker_warning_alert *p)
void TorrentImpl::handleTrackerErrorAlert(const lt::tracker_error_alert *p) void TorrentImpl::handleTrackerErrorAlert(const lt::tracker_error_alert *p)
{ {
const QString trackerUrl = p->tracker_url();
// Starting with libtorrent 1.2.x each tracker has multiple local endpoints from which // 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. // an announce is attempted. Some endpoints might succeed while others might fail.
// Emit the signal only if all endpoints have failed. // Emit the signal only if all endpoints have failed.
const QVector<TrackerEntry> trackerList = trackers(); const std::vector<lt::announce_entry> trackerList = m_nativeHandle.trackers();
const auto iter = std::find_if(trackerList.cbegin(), trackerList.cend(), [&trackerUrl](const TrackerEntry &entry) const auto iter = std::find_if(trackerList.cbegin(), trackerList.cend(), [p](const lt::announce_entry &entry)
{ {
return (entry.url == trackerUrl); return (entry.url == p->tracker_url());
}); });
if ((iter != trackerList.cend()) && (iter->status == TrackerEntry::NotWorking))
m_session->handleTorrentTrackerError(this, trackerUrl); if (iter == trackerList.cend())
return;
const QString trackerURL = QString::fromStdString(iter->url);
#ifdef QBT_USES_LIBTORRENT2
const TrackerEntry entry = fromNativeAnnounceEntry(*iter, m_nativeHandle.info_hashes(), m_trackerPeerCounts[trackerURL]);
#else
const TrackerEntry entry = fromNativeAnnounceEntry(*iter, m_trackerPeerCounts[trackerURL]);
#endif
if (entry.status == TrackerEntry::NotWorking)
m_session->handleTorrentTrackerError(this, trackerURL);
} }
void TorrentImpl::handleTorrentCheckedAlert(const lt::torrent_checked_alert *p) void TorrentImpl::handleTorrentCheckedAlert(const lt::torrent_checked_alert *p)