github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-16 02:03:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Let ReverseResolution always return/emit a result

Browse source
This commit is contained in:
Chocobo1 2020-01-30 15:04:46 +08:00
parent ff31bb86bc
commit b2ab6c1858
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
2 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/base/net/reverseresolution.cpp
View file

@ -59,14 +59,8 @@ ReverseResolution::~ReverseResolution()
void ReverseResolution::resolve(const QHostAddress &ip) void ReverseResolution::resolve(const QHostAddress &ip)
{ {
if (ip.isNull())
return;
const QString *hostname = m_cache.object(ip); const QString *hostname = m_cache.object(ip);
if (hostname) { if (hostname) {
if (hostname->isEmpty())
; // resolution didn't get meaningful results, so do nothing
else
emit ipResolved(ip, *hostname); emit ipResolved(ip, *hostname);
return; return;
} }
@ -80,15 +74,14 @@ void ReverseResolution::hostResolved(const QHostInfo &host)
{ {
const QHostAddress ip = m_lookups.take(host.lookupId()); const QHostAddress ip = m_lookups.take(host.lookupId());
if (host.error() != QHostInfo::NoError) if (host.error() != QHostInfo::NoError) {
emit ipResolved(ip, {});
return; return;
}
const QString hostname = host.hostName(); const QString hostname = isUsefulHostName(host.hostName(), ip)
if (isUsefulHostName(hostname, ip)) { ? host.hostName()
: QString();
m_cache.insert(ip, new QString(hostname)); m_cache.insert(ip, new QString(hostname));
emit ipResolved(ip, hostname); emit ipResolved(ip, hostname);
} }
else {
m_cache.insert(ip, new QString());
}
}

3
src/gui/properties/peerlistwidget.cpp
View file

@ -428,6 +428,9 @@ void PeerListWidget::updatePeer(const BitTorrent::TorrentHandle *torrent, const
void PeerListWidget::handleResolved(const QHostAddress &ip, const QString &hostname) const void PeerListWidget::handleResolved(const QHostAddress &ip, const QString &hostname) const
{ {
if (hostname.isEmpty())
return;
const QSet<QStandardItem *> items = m_itemsByIP.value(ip); const QSet<QStandardItem *> items = m_itemsByIP.value(ip);
for (QStandardItem *item : items) for (QStandardItem *item : items)
item->setData(hostname, Qt::DisplayRole); item->setData(hostname, Qt::DisplayRole);