squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-21 16:07:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve ReverseResolution class

Browse Source 
* Use QHostAddress type for IP
* Avoid double lookup
* Use larger cache size
This commit is contained in:
Chocobo1
2020-01-28 13:53:06 +08:00
parent 11bea8d393
commit 86e3d0d816
4 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/base/net/reverseresolution.cpp
View File

@@ -28,19 +28,19 @@
#include "reverseresolution.h"
#include <QDebug>
#include <QHostAddress>
#include <QHostInfo>
#include <QString>
const int CACHE_SIZE = 500;
const int CACHE_SIZE = 2048;
using namespace Net;
namespace
{
bool isUsefulHostName(const QString &hostname, const QString &ip)
bool isUsefulHostName(const QString &hostname, const QHostAddress &ip)
{
return (!hostname.isEmpty() && (hostname != ip));
return (!hostname.isEmpty() && (hostname != ip.toString()));
}
}
@@ -52,37 +52,40 @@ ReverseResolution::ReverseResolution(QObject *parent)
ReverseResolution::~ReverseResolution()
{
qDebug("Deleting host name resolver...");
}
void ReverseResolution::resolve(const QString &ip)
void ReverseResolution::resolve(const QHostAddress &ip)
{
if (m_cache.contains(ip)) {
const QString &hostname = *m_cache.object(ip);
qDebug() << "Resolved host name using cache: " << ip << " -> " << hostname;
if (isUsefulHostName(hostname, ip))
emit ipResolved(ip, hostname);
}
else {
// Actually resolve the ip
m_lookups.insert(QHostInfo::lookupHost(ip, this, &ReverseResolution::hostResolved), ip);
if (ip.isNull())
return;
const QString *hostname = m_cache.object(ip);
if (hostname) {
if (hostname->isEmpty())
; // resolution didn't get meaningful results, so do nothing
else
emit ipResolved(ip, *hostname);
return;
}
// do reverse lookup: IP -> hostname
const int lookupId = QHostInfo::lookupHost(ip.toString(), this, &ReverseResolution::hostResolved);
m_lookups.insert(lookupId, ip);
}
void ReverseResolution::hostResolved(const QHostInfo &host)
{
const QString ip = m_lookups.take(host.lookupId());
Q_ASSERT(!ip.isNull());
const QHostAddress ip = m_lookups.take(host.lookupId());
if (host.error() != QHostInfo::NoError) {
qDebug() << "DNS Reverse resolution error: " << host.errorString();
if (host.error() != QHostInfo::NoError)
return;
}
const QString hostname = host.hostName();
qDebug() << Q_FUNC_INFO << ip << QString("->") << hostname;
m_cache.insert(ip, new QString(hostname));
if (isUsefulHostName(hostname, ip))
if (isUsefulHostName(hostname, ip)) {
m_cache.insert(ip, new QString(hostname));
emit ipResolved(ip, hostname);
}
else {
m_cache.insert(ip, new QString());
}
}

9
src/base/net/reverseresolution.h
View File

@@ -32,6 +32,7 @@
#include <QCache>
#include <QObject>
class QHostAddress;
class QHostInfo;
class QString;
@@ -46,17 +47,17 @@ namespace Net
explicit ReverseResolution(QObject *parent = nullptr);
~ReverseResolution();
void resolve(const QString &ip);
void resolve(const QHostAddress &ip);
signals:
void ipResolved(const QString &ip, const QString &hostname);
void ipResolved(const QHostAddress &ip, const QString &hostname);
private slots:
void hostResolved(const QHostInfo &host);
private:
QHash<int /* LookupID */, QString /* IP */> m_lookups;
QCache<QString /* IP */, QString /* HostName */> m_cache;
QHash<int, QHostAddress> m_lookups; // <LookupID, IP>
QCache<QHostAddress, QString> m_cache; // <IP, HostName>
};
}