Skip to content

Commit

Permalink
v3.3.11.5
Browse files Browse the repository at this point in the history
  • Loading branch information
c0re100 committed Apr 1, 2017
1 parent 6b00b16 commit d0b03fd
Show file tree
Hide file tree
Showing 50 changed files with 27 additions and 26 deletions.
2 changes: 1 addition & 1 deletion dist/windows/options.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ XPStyle on
!define CSIDL_APPDATA '0x1A' ;Application Data path
!define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path

!define PROG_VERSION "3.3.11.4"
!define PROG_VERSION "3.3.11.5"
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
!define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)
Expand Down
4 changes: 4 additions & 0 deletions dist/windows/qbittorrent.nsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
!include options.nsi
!include translations.nsi
!include installer.nsi
!include uninstaller.nsi
Binary file removed dist/windows/translations/qt_ar.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_bg.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_ca.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_cs.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_da.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_de.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_es.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_eu.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_fa.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_fi.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_fr.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_gl.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_he.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_hu.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_it.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_ja.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_ko.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_lt.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_nl.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_pl.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_pt.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_pt_BR.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_ru.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_sk.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_sl.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_sv.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_tr.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_uk.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_zh_CN.qm
Binary file not shown.
Binary file removed dist/windows/translations/qt_zh_TW.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_ca.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_cs.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_de.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_fi.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_fr.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_he.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_hu.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_it.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_ja.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_ko.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_lv.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_pl.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_ru.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_sk.qm
Binary file not shown.
Binary file removed dist/windows/translations/qtbase_uk.qm
Binary file not shown.
6 changes: 4 additions & 2 deletions src/base/bittorrent/session.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1413,13 +1413,15 @@ void Session::removeBannedIP(const QString &ip)
void Session::EraseIPFilter()
{
m_nativeSession->set_ip_filter(libt::ip_filter());
processBannedIPs();
disableIPFilter();
enableIPFilter();
}

void Session::AutoEraseIPFilter()
{
m_nativeSession->set_ip_filter(libt::ip_filter());
processBannedIPs();
disableIPFilter();
enableIPFilter();
Logger::instance()->addMessage(tr("[Task Scheduler] IP Filter erased."), Log::INFO);
}

Expand Down
39 changes: 17 additions & 22 deletions src/gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1359,44 +1359,39 @@ void MainWindow::updateGUI()
QString pid = peer.pid().left(8);
QString country = peer.country();

if(client >= "0.0.0.0" && client <= "9.99.99.9999" || client.contains("Xunlei") || client.contains("XL") || pid.contains("-XL") || pid.contains("-SD")) {
qDebug("Auto Banning Xunlei peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Xunlei peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
if (client >= "0.0.0.0" && client <= "9.99.99.9999" || client.contains("Xunlei") || client.contains("XL") || pid.contains("-XL") || pid.contains("-SD")) {
qDebug("Auto Banning Xunlei Peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Xunlei Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
BitTorrent::Session::instance()->blockIP(ip);
continue;
}

if(client.contains("Xf") || pid.contains("-XF")) {
qDebug("Auto Banning Xfplay peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Xfplay peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
if (client.contains("Xf") || pid.contains("-XF")) {
qDebug("Auto Banning Xfplay Peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Xfplay Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
BitTorrent::Session::instance()->blockIP(ip);
continue;
}

if(client.contains("QQ") || pid.contains("-QD"))
{
qDebug("Auto Banning QQDownload peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning QQDownload peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
if (client.contains("QQ") || pid.contains("-QD")) {
qDebug("Auto Banning QQDownload Peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning QQDownload Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
BitTorrent::Session::instance()->blockIP(ip);
continue;
}

if(client.contains("Baidu") || pid.contains("-BD"))
{
qDebug("Auto Banning Baidu peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Baidu peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
if (client.contains("Baidu") || pid.contains("-BN")) {
qDebug("Auto Banning Baidu Peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Baidu Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
BitTorrent::Session::instance()->blockIP(ip);
continue;
}


if(client.contains("Unknown"))
{
if(m_AutoBan && country == "CN") {
qDebug("Auto Banning Unknown peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Unknown peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
BitTorrent::Session::instance()->banIP(ip);
continue;
if(m_AutoBan) {
if(client.contains("Unknown") && country == "CN") {
qDebug("Auto Banning Unknown Peer %s...", ip.toLocal8Bit().data());
Logger::instance()->addMessage(tr("Auto banning Unknown Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
BitTorrent::Session::instance()->blockIP(ip);
}
}

Expand Down
2 changes: 1 addition & 1 deletion version.pri
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PROJECT_NAME = qbittorrent
VER_MAJOR = 3
VER_MINOR = 3
VER_BUGFIX = 11
VER_BUILD = 4
VER_BUILD = 5
VER_STATUS = # Should be empty for stable releases!

# Don't touch the rest part
Expand Down

0 comments on commit d0b03fd

Please sign in to comment.