github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-20 13:23:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Show reason why a peer was blocked. Needs libtorrent 1.0.x.

Browse source
This commit is contained in:
sledgehammer999 2014-12-07 15:09:16 +02:00
commit cd52d1820d
2 changed files with 57 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/qtlibtorrent/qbtsession.cpp
View file

@ -1725,17 +1725,26 @@ void QBtSession::addConsoleMessage(QString msg, QColor color) {
#endif #endif
} }
void QBtSession::addPeerBanMessage(QString ip, bool from_ipfilter) { #if LIBTORRENT_VERSION_NUM < 10000
if (peerBanMessages.size() > MAX_LOG_MESSAGES) { void QBtSession::addPeerBanMessage(const QString& ip, bool blocked)
peerBanMessages.removeFirst(); #else
} void QBtSession::addPeerBanMessage(const QString& ip, bool blocked, const QString& blockedReason)
QString msg; #endif
if (from_ipfilter) {
msg = "<font color='grey'>" + QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + "</font> - " + tr("<font color='red'>%1</font> was blocked", "x.y.z.w was blocked").arg(ip); if (peerBanMessages.size() > MAX_LOG_MESSAGES) {
else peerBanMessages.removeFirst();
msg = "<font color='grey'>" + QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + "</font> - " + tr("<font color='red'>%1</font> was banned", "x.y.z.w was banned").arg(ip); }
peerBanMessages.append(msg); QString msg;
emit newBanMessage(msg); if (blocked)
#if LIBTORRENT_VERSION_NUM < 10000
msg = "<font color='grey'>" + QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + "</font> - " + tr("<font color='red'>%1</font> was blocked", "x.y.z.w was blocked").arg(ip);
#else
msg = "<font color='grey'>" + QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + "</font> - " + tr("<font color='red'>%1</font> was blocked %2", "x.y.z.w was blocked").arg(ip).arg(blockedReason);
#endif
else
msg = "<font color='grey'>" + QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + "</font> - " + tr("<font color='red'>%1</font> was banned", "x.y.z.w was banned").arg(ip);
peerBanMessages.append(msg);
emit newBanMessage(msg);
} }
bool QBtSession::isFilePreviewPossible(const QString &hash) const { bool QBtSession::isFilePreviewPossible(const QString &hash) const {
@ -2616,13 +2625,38 @@ void QBtSession::handlePortmapAlert(libtorrent::portmap_alert* p) {
//emit UPnPSuccess(QString(p->msg().c_str())); //emit UPnPSuccess(QString(p->msg().c_str()));
} }
void QBtSession::handlePeerBlockedAlert(libtorrent::peer_blocked_alert* p) { void QBtSession::handlePeerBlockedAlert(libtorrent::peer_blocked_alert* p)
boost::system::error_code ec; {
string ip = p->ip.to_string(ec); boost::system::error_code ec;
if (!ec) { string ip = p->ip.to_string(ec);
addPeerBanMessage(QString::fromLatin1(ip.c_str()), true); QString reason;
//emit peerBlocked(QString::fromLatin1(ip.c_str())); switch (p->reason) {
} case peer_blocked_alert::ip_filter:
reason = tr("due to IP filter.", "this peer was blocked due to ip filter.");
break;
case peer_blocked_alert::port_filter:
reason = tr("due to port filter.", "this peer was blocked due to port filter.");
break;
case peer_blocked_alert::i2p_mixed:
reason = tr("due to i2p mixed mode restrictions.", "this peer was blocked due to i2p mixed mode restrictions.");
break;
case peer_blocked_alert::privileged_ports:
reason = tr("because it has a low port.", "this peer was blocked because it has a low port.");
break;
case peer_blocked_alert::utp_disabled:
reason = tr("because μTP is disabled.", "this peer was blocked because μTP is disabled.");
break;
case peer_blocked_alert::tcp_disabled:
reason = tr("because TCP is disabled.", "this peer was blocked because TCP is disabled.");
break;
}
if (!ec)
#if LIBTORRENT_VERSION_NUM < 10000
addPeerBanMessage(QString::fromLatin1(ip.c_str()), true);
#else
addPeerBanMessage(QString::fromLatin1(ip.c_str()), true, reason);
#endif
} }
void QBtSession::handlePeerBanAlert(libtorrent::peer_ban_alert* p) { void QBtSession::handlePeerBanAlert(libtorrent::peer_ban_alert* p) {

6
src/qtlibtorrent/qbtsession.h
View file

@ -204,7 +204,11 @@ public slots:
#else #else
void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText)); void addConsoleMessage(QString msg, QColor color=QApplication::palette().color(QPalette::WindowText));
#endif #endif
void addPeerBanMessage(QString msg, bool from_ipfilter); #if LIBTORRENT_VERSION_NUM < 10000
void addPeerBanMessage(const QString &msg, bool blocked);
#else
void addPeerBanMessage(const QString &msg, bool blocked, const QString &blockedReason = QString());
#endif
void clearConsoleMessages() { consoleMessages.clear(); } void clearConsoleMessages() { consoleMessages.clear(); }
void clearPeerBanMessages() { peerBanMessages.clear(); } void clearPeerBanMessages() { peerBanMessages.clear(); }
void processDownloadedFile(QString, QString); void processDownloadedFile(QString, QString);