Merge Lean's source

package/lean/luci-app-qbittorrent/Makefile

@@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for qBittorrent
 LUCI_DEPENDS:=+qBittorrent +python
 LUCI_PKGARCH:=all
 PKG_VERSION=1.0
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

package/lean/luci-app-qbittorrent/po/zh-cn/qbittorrent.po

@@ -72,3 +72,503 @@ msgstr "WebUI 设置"
 
 msgid "Advance Settings"
 msgstr "高级设置"
+
+
+msgid "Run daemon as user"
+msgstr "用户组"
+
+msgid "Parent Path for Profile Folder"
+msgstr "配置保存路径"
+
+msgid "The path for storing profile folder using by command: <b>--profile [PATH]</b>."
+msgstr "配置文件的保存路径，默认的配置文件夹在/tmp下。例如：<code>/etc/config</code>"
+
+msgid "Profile Folder Suffix"
+msgstr "配置目录后缀"
+
+msgid "Suffix for profile folder, for example, <b>qBittorrent_[NAME]</b>."
+msgstr "配置文件文件夹的后缀。例如： <b>qBittorrent_[NAME]</b>"
+
+msgid "Locale Language"
+msgstr "WebUI语言"
+
+msgid "English"
+msgstr "英文"
+
+msgid "Chinese"
+msgstr "中文"
+
+msgid "Enable Log"
+msgstr "启用日志"
+
+msgid "Enable logger to log file."
+msgstr "qBittorrent的启动和运行信息文档。"
+
+msgid "Log Path"
+msgstr "日志文件"
+
+msgid "The path for qbittorrent log."
+msgstr "日志文件自定义保存路径，默认都在配置文件夹的data下。"
+
+msgid "Enable Backup"
+msgstr "启用备份"
+
+msgid "Backup log file when oversize the given size."
+msgstr "备份日志文件。"
+
+msgid "Delete Old Backup"
+msgstr "删除备份"
+
+msgid "Delete the old log file."
+msgstr "符合下列设定后将删除旧的日志文件。"
+
+msgid "Log Max Size"
+msgstr "日志保存大小"
+
+msgid "Log Saving Period"
+msgstr "日志保存期限"
+
+msgid "The max size for qbittorrent log (Unit: Bytes)."
+msgstr "设定日志文件的大小（单位：字节）"
+
+msgid "The log file will be deteted after given time. 1d -- 1 day, 1m -- 1 month, 1y -- 1 year"
+msgstr "设定日志文件的时间（1d-1天,1m-1个月,1y-1年）"
+
+msgid "Connection Settings"
+msgstr "连接设置"
+
+msgid "Use UPnP for Connections"
+msgstr "端口自动转发"
+
+msgid "Use UPnP/ NAT-PMP port forwarding from my router."
+msgstr "使用路由器的UPnP/NAT-PMP端口自动转发。"
+
+msgid "Use Random Port"
+msgstr "启用随机端口"
+
+msgid "Use different port on each startup voids the first"
+msgstr "在每次启动时使用随机的端口。"
+
+msgid "Connection Port"
+msgstr "自定义端口"
+
+msgid "Generate Randomly"
+msgstr "默认端口：8999"
+
+msgid "Global Download Speed"
+msgstr "全局下载速度限制"
+
+msgid "Global Download Speed Limit(KiB/s)."
+msgstr "全局下载速度限制(KiB/s)，0为无限制。"
+
+msgid "Global Upload Speed"
+msgstr "全局上传速度限制"
+
+msgid "Alternative Download Speed"
+msgstr "备用下载速度限制"
+
+msgid "Alternative Upload Speed"
+msgstr "备用上传速度限制"
+
+msgid "Global Upload Speed Limit(KiB/s)."
+msgstr "全局上传速度限制(KiB/s)，0为无限制。"
+
+msgid "Alternative Download Speed Limit(KiB/s)."
+msgstr "备用下载速度限制(KiB/s)，0为无限制。"
+
+msgid "Alternative Upload Speed Limit(KiB/s)."
+msgstr "备用上传速度限制(KiB/s)，0为无限制。"
+
+msgid "Enabled protocol"
+msgstr "启用的协议"
+
+msgid "The protocol that was enabled."
+msgstr "当前已启用的协议。"
+
+msgid "TCP and UTP"
+msgstr "TCP和UTP"
+
+msgid "Inet Address"
+msgstr "输入地址"
+
+msgid "The address that respond to the trackers."
+msgstr "响应跟踪器的地址。"
+
+msgid "When adding seeds"
+msgstr "当添加种子时"
+
+msgid "Downloads Settings"
+msgstr "下载设置"
+
+msgid "Create Subfolder"
+msgstr "创建目录"
+
+msgid "Create subfolder for torrents with multiple files."
+msgstr "为含多个文件的种子创建子文件夹。"
+
+msgid "Start In Pause"
+msgstr "开始暂停"
+
+msgid "Do not start the download automatically."
+msgstr "在下载任务添加后暂停。"
+
+msgid "Auto Delete Torrent File"
+msgstr "删除种子"
+
+msgid "The .torrent files will be deleted afterwards."
+msgstr "下载完成后自动删除这个种子文件。"
+
+msgid "Pre Allocation"
+msgstr "磁盘预分配"
+
+msgid "Pre-allocate disk space for all files."
+msgstr "为刚添加的文件预先分配磁盘空间。"
+
+msgid "Use Incomplete Extension"
+msgstr "使用扩展名"
+
+msgid "The incomplete task will be added the extension of !qB."
+msgstr "为不完整的文件添加后缀名<code>!qB</code>"
+
+msgid "Save Path"
+msgstr "文件保存路径"
+
+msgid "The path to save the download file. For example:<code>/mnt/sda1/download</code>"
+msgstr "下载文件的保存路径。例如：<code>/mnt/sda1/download</code>"
+
+msgid "Temp Path Enabled"
+msgstr "启用临时目录"
+
+msgid "Temp Path"
+msgstr "临时路径"
+
+msgid "The absolute and relative path can be set."
+msgstr "可以设置绝对和相对路径。"
+
+msgid "Disk Cache Size (MiB)"
+msgstr "磁盘缓存"
+
+msgid "The value -1 is auto and 0 is disable. In default, it is set to 64MiB."
+msgstr "数值1是自动的，0是禁用的。默认设置为64MiB。"
+
+msgid "Disk Cache TTL (s)"
+msgstr "磁盘缓存TTL"
+
+msgid "In default, it is set to 60s."
+msgstr "默认设置为60秒。"
+
+msgid "Saving Management"
+msgstr "保存管理"
+
+msgid "Default Torrent Management Mode"
+msgstr "默认种子管理模式"
+
+msgid "Manual"
+msgstr "手动"
+
+msgid "Automaic"
+msgstr "自动"
+
+msgid "Torrent Category Changed"
+msgstr "当种子分类修改时"
+
+msgid "Choose the action when torrent category changed."
+msgstr "选择种子类别更改时的操作。"
+
+msgid "Switch torrent to Manual Mode"
+msgstr "将种子切换到手动模式"
+
+msgid "Relocate torrent"
+msgstr "重新定位种子"
+
+msgid "Default Save Path Changed"
+msgstr "当默认保存路径修改时"
+
+msgid "Choose the action when default save path changed."
+msgstr "选择默认保存路径更改时的操作。"
+
+msgid "Switch affected torrent to Manual Mode"
+msgstr "将受影响的种子切换到手动模式"
+
+msgid "Relocate affected torrent"
+msgstr "重新定位种子"
+
+msgid "Category Save Path Changed"
+msgstr "当分类保存路径修改时"
+
+msgid "Choose the action when category save path changed."
+msgstr "选择分类保存路径更改时的操作。"
+
+msgid "Torrent Export Dir"
+msgstr "种子导出目录"
+
+msgid "The .torrent files will be copied to the target directory."
+msgstr "种子文件将被复制到目标目录。例如：<code>/etc/config</code>"
+
+msgid "Finished Torrent Export Dir"
+msgstr "复制种子文件"
+
+msgid "The .torrent files for finished downloads will be copied to the target directory."
+msgstr "将已下载完成的种子文件复制到目标目录。例如：<code>/etc/config</code>"
+
+msgid "Bittorrent Settings"
+msgstr "BT设置""
+
+msgid "Enable DHT"
+msgstr "启用DHT"
+
+msgid "Enable DHT (decentralized network) to find more peers"
+msgstr "启用DHT(去中心化网络) 以找到更多用户。"
+
+msgid "Enable PeX"
+msgstr "启用PeX"
+
+msgid "Enable Peer Exchange (PeX) to find more peers"
+msgstr "启用用户交换(PeX)以找到更多用户。"
+
+msgid "Enable LSD"
+msgstr "启用LSD"
+
+msgid "Enable Local Peer Discovery to find more peers"
+msgstr "启用本地用户发现以找到更多用户。"
+
+msgid "uTP Rate Limit"
+msgstr "uTP速度限制"
+
+msgid "Apply rate limit to µTP protocol."
+msgstr "针对µTP协议进行速度限制。"
+
+msgid "Encryption Mode"
+msgstr "加密模式"
+
+msgid "Enable DHT (decentralized network) to find more peers"
+msgstr "使DHT（分散网络）能够找到更多的对等点。"
+
+msgid "Prefer Encryption"
+msgstr "偏好加密"
+
+msgid "Require Encryption"
+msgstr "强制加密"
+
+msgid "Disable Encryption"
+msgstr "禁用加密"
+
+msgid "Max Connections"
+msgstr "连接数限制"
+
+msgid "The max number of connections."
+msgstr "全局最大连接数。"
+
+msgid "Max Connections Per Torrent"
+msgstr "种子连接数限制"
+
+msgid "The max number of connections per torrent."
+msgstr "每个种子的最大连接数。"
+
+msgid "Max Uploads"
+msgstr "最大上传数"
+
+msgid "The max number of connected peers."
+msgstr "全局最大上传线程数。"
+
+msgid "Max Uploads Per Torrent"
+msgstr "种子上传限制"
+
+msgid "The max number of connected peers per torrent."
+msgstr "每个种子上传线程最大值。"
+
+msgid "Share rate limit"
+msgstr "分享率限制"
+
+msgid "Max Ratio"
+msgstr "最大的分享率"
+
+msgid "The max ratio for seeding. -1 is to disable the seeding."
+msgstr "分享的最大比例设定。-1是禁用做种。"
+
+msgid "Max Seeding Minutes"
+msgstr "最大做种时间"
+
+msgid "Units: minutes"
+msgstr "做种最大比例设定。单位：分钟"
+
+msgid "Max Ratio Action"
+msgstr "达到后"
+
+msgid "The action when reach the max seeding ratio."
+msgstr "达到设定分享率和时间后的动作。"
+
+msgid "Pause them"
+msgstr "暂停"
+
+msgid "Remove them"
+msgstr "删除"
+
+msgid "Queueing Setting"
+msgstr "种子排队设置"
+
+msgid "Enable Torrent Queueing"
+msgstr "启用种子排队"
+
+msgid "Maximum Active Downloads"
+msgstr "最大活动的下载数"
+
+msgid "Max Active Uploads"
+msgstr "最大活动的上传数"
+
+msgid "Max Active Torrents"
+msgstr "最大活动的种子数"
+
+msgid "Ignore Slow Torrents"
+msgstr "忽略慢速的种子"
+
+msgid "Do not count slow torrents in these limits."
+msgstr "慢速的种子不包在括限制内。"
+
+msgid "Download rate threshold"
+msgstr "下载速度阈值"
+
+msgid "Upload rate threshold"
+msgstr "上传速度阈值"
+
+msgid "Units: KiB/s"
+msgstr "单位：KiB/s"
+
+msgid "Torrent inactivity timer"
+msgstr "种子不活动时间"
+
+msgid "Units: seconds"
+msgstr "时间单位：分钟"
+
+msgid "WebUI Settings"
+msgstr "WebUI设置"
+
+msgid "Username"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Use UPnP for WebUI"
+msgstr "WebUI端口转发"
+
+msgid "Using the UPnP / NAT-PMP port of the router for connecting to WebUI."
+msgstr "使用路由器的UPnP/NAT-PMP端口转发到WebUI。"
+
+msgid "The login name for WebUI."
+msgstr "WebUI的登录用户名设置。"
+
+msgid "The login password for WebUI."
+msgstr "WebUI用户的登录密码设置。"
+
+msgid "The listening port for WebUI."
+msgstr "WebUI的登录端口设置。默认端口：8080"
+
+msgid "CSRF Protection"
+msgstr "CSRF保护"
+
+msgid "Enable Cross-Site Request Forgery (CSRF) protection."
+msgstr "启用跨站点请求伪造(CSRF)保护。"
+
+msgid "Clickjacking Protection"
+msgstr "劫持保护"
+
+msgid "Enable clickjacking protection."
+msgstr "启用点击劫持保护。"
+
+msgid "Host Header Validation"
+msgstr "主机标头验证"
+
+msgid "Validate the host header."
+msgstr "启用主机标头验证."
+
+msgid "Local Host Authentication"
+msgstr "本地主机认证"
+
+msgid "Force authentication for clients on localhost."
+msgstr "强制对本地主机上的客户端进行身份验证。"
+
+msgid "Enable Subnet Whitelist"
+msgstr "使子网白名单"
+
+msgid "Subnet Whitelist"
+msgstr "输入IP地址"
+
+msgid "Skip authentication for clients in the IP subnet white list."
+msgstr "对IP子网白名单中的客户端跳过身份验证."
+
+msgid "Advance Settings"
+msgstr "高级设置"
+
+msgid "Anonymous Mode"
+msgstr "匿名模式"
+
+msgid "When enabled, qBittorrent will take certain measures to try"
+msgstr "启用后，qBittorrent将采取某些措施隐藏其身份。"
+
+msgid "Super Seeding"
+msgstr "超级种子"
+
+msgid "The super seeding mode."
+msgstr "超级种子模式。"
+
+msgid "Limit Overhead Usage"
+msgstr "开销限制"
+
+msgid "The overhead usage is been limitted."
+msgstr "对传送总开销进行速度限制。"
+
+msgid "Ignore LAN Limit"
+msgstr "LAN限制"
+
+msgid "Ignore the speed limit to LAN."
+msgstr "忽略对LAN的速度限制。"
+
+msgid "Use os Cache"
+msgstr "使用OS操作系统缓存管理"
+
+msgid "Max Outgoing Port"
+msgstr "端口设置"
+
+msgid The max outgoing port.""
+msgstr "最大输出端口。"
+
+msgid "Min Outgoing Port"
+msgstr "端口设置"
+
+msgid "The min outgoing port."
+msgstr "最小输出端口。"
+
+msgid "Choking Algorithm"
+msgstr "数据传输算法"
+
+msgid "The strategy of choking algorithm."
+msgstr "数据传输算法的策略。"
+
+msgid "Round Robin"
+msgstr "负载均衡"
+
+msgid "Fastest Upload"
+msgstr "最快上传"
+
+msgid "Anti-Leech"
+msgstr "反吸血"
+
+msgid "Announce To All Trackers"
+msgstr "对所有Trackers宣告"
+
+msgid "Announce To All Tiers"
+msgstr "对所有Tiers宣告"
+
+msgid "configuration file"
+msgstr "配置文件"
+
+msgid "Operation log"
+msgstr "运行日志"
+
+msgid "This page is the log document content of qbittorrent."
+msgstr "本页是qBittorrent的日志文档内容。"
+
+msgid "This page is the content of the configuration document under /etc/config/qbittorrent."
+msgstr "本页是/etc/config/qbittorrent下的配置文档内容。"
+

package/lean/qBittorrent/Makefile

@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qbittorrent
-PKG_VERSION:=4.2.0
-PKG_RELEASE=1
+PKG_VERSION:=4.1.9
+PKG_RELEASE=5
 
 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/qbittorrent/qBittorrent/tar.gz/release-$(PKG_VERSION)?
-PKG_HASH:=2f367b89d7049c09e808fc5f7c338ce1820d91bcaecddcad681e9ba18b13206d
+PKG_HASH:=620127f73f88ed3f2b2e4195cbc641f7c27f967d3b045e45f7916c0995fd61fe
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/qBittorrent-release-$(PKG_VERSION)
 

package/lean/qBittorrent/patches/001-remove-ico-not-for-webui.patch

@@ -0,0 +1,126 @@
+--- a/src/icons/icons.qrc
++++ b/src/icons/icons.qrc
+@@ -250,38 +250,16 @@
+         <file>flags/zm.svg</file>
+         <file>flags/zw.svg</file>
+         <file>L.gif</file>
+-        <file>loading.png</file>
+         <file>qbt-theme/application-exit.svg</file>
+-        <file>qbt-theme/application-rss+xml.svg</file>
+-        <file>qbt-theme/application-x-mswinurl.svg</file>
+         <file>qbt-theme/checked.svg</file>
+         <file>qbt-theme/configure.svg</file>
+-        <file>qbt-theme/dialog-cancel.svg</file>
+-        <file>qbt-theme/dialog-information.svg</file>
+-        <file>qbt-theme/dialog-warning.svg</file>
+         <file>qbt-theme/document-edit-verify.svg</file>
+         <file>qbt-theme/document-edit.svg</file>
+-        <file>qbt-theme/document-encrypt.svg</file>
+-        <file>qbt-theme/document-import.svg</file>
+-        <file>qbt-theme/document-new.svg</file>
+-        <file>qbt-theme/document-properties.svg</file>
+-        <file>qbt-theme/document-save.svg</file>
+-        <file>qbt-theme/download.svg</file>
+-        <file>qbt-theme/edit-clear-history.svg</file>
+         <file>qbt-theme/edit-clear.svg</file>
+         <file>qbt-theme/edit-copy.svg</file>
+-        <file>qbt-theme/edit-cut.svg</file>
+         <file>qbt-theme/edit-delete.svg</file>
+-        <file>qbt-theme/edit-find-user.svg</file>
+         <file>qbt-theme/edit-find.svg</file>
+-        <file>qbt-theme/edit-paste.svg</file>
+         <file>qbt-theme/edit-rename.svg</file>
+-        <file>qbt-theme/folder-documents.svg</file>
+-        <file>qbt-theme/folder-download.svg</file>
+-        <file>qbt-theme/folder-new.svg</file>
+-        <file>qbt-theme/folder-remote.svg</file>
+-        <file>qbt-theme/gear.svg</file>
+-        <file>qbt-theme/gear32.svg</file>
+         <file>qbt-theme/go-bottom.svg</file>
+         <file>qbt-theme/go-down.svg</file>
+         <file>qbt-theme/go-top.svg</file>
+@@ -295,43 +273,15 @@
+         <file>qbt-theme/kt-set-max-upload-speed.png</file>
+         <file>qbt-theme/list-add.svg</file>
+         <file>qbt-theme/list-remove.svg</file>
+-        <file>qbt-theme/mail-folder-inbox.svg</file>
+-        <file>qbt-theme/mail-mark-read.svg</file>
+         <file>qbt-theme/media-playback-pause.svg</file>
+         <file>qbt-theme/media-playback-start.svg</file>
+         <file>qbt-theme/media-seek-forward.svg</file>
+-        <file>qbt-theme/network-server.svg</file>
+-        <file>qbt-theme/network-wired.svg</file>
+-        <file>qbt-theme/object-locked.svg</file>
+-        <file>qbt-theme/office-chart-line.svg</file>
+-        <file>qbt-theme/preferences-desktop.svg</file>
+-        <file>qbt-theme/preferences-other.svg</file>
+-        <file>qbt-theme/preferences-system-network.svg</file>
+-        <file>qbt-theme/preferences-web-browser-cookies.svg</file>
+-        <file>qbt-theme/rss-config.png</file>
+         <file>qbt-theme/security-high.svg</file>
+         <file>qbt-theme/security-low.svg</file>
+-        <file>qbt-theme/services.svg</file>
+-        <file>qbt-theme/speedometer.svg</file>
+         <file>qbt-theme/system-log-out.svg</file>
+-        <file>qbt-theme/tab-close.svg</file>
+-        <file>qbt-theme/task-attention.svg</file>
+-        <file>qbt-theme/task-complete.png</file>
+-        <file>qbt-theme/task-ongoing.png</file>
+-        <file>qbt-theme/task-reject.png</file>
+-        <file>qbt-theme/text-plain.svg</file>
+-        <file>qbt-theme/tools-report-bug.svg</file>
+-        <file>qbt-theme/unavailable.svg</file>
+-        <file>qbt-theme/user-group-delete.svg</file>
+-        <file>qbt-theme/user-group-new.svg</file>
+-        <file>qbt-theme/view-calendar-journal.svg</file>
+         <file>qbt-theme/view-categories.svg</file>
+-        <file>qbt-theme/view-filter.svg</file>
+-        <file>qbt-theme/view-preview.svg</file>
+-        <file>qbt-theme/view-refresh.svg</file>
+         <file>qbt-theme/view-statistics.svg</file>
+         <file>qbt-theme/wallet-open.svg</file>
+-        <file>qbt-theme/webui.svg</file>
+         <file>skin/arrow-right.gif</file>
+         <file>skin/bg-dropdown.gif</file>
+         <file>skin/bg-handle-horizontal.gif</file>
+@@ -342,7 +292,6 @@
+         <file>skin/completed.svg</file>
+         <file>skin/connected.svg</file>
+         <file>skin/disconnected.svg</file>
+-        <file>skin/dock-tabs.gif</file>
+         <file>skin/download.svg</file>
+         <file>skin/downloading.svg</file>
+         <file>skin/error.svg</file>
+@@ -353,14 +302,11 @@
+         <file>skin/handle-icon-horizontal.gif</file>
+         <file>skin/handle-icon.gif</file>
+         <file>skin/knob.gif</file>
+-        <file>skin/logo-blank.gif</file>
+         <file>skin/logo.gif</file>
+         <file>skin/logo2.gif</file>
+         <file>skin/mascot.png</file>
+         <file>skin/paused.svg</file>
+         <file>skin/qbittorrent-tray.svg</file>
+-        <file>skin/qbittorrent-tray-dark.svg</file>
+-        <file>skin/qbittorrent-tray-light.svg</file>
+         <file>skin/qbittorrent32.png</file>
+         <file>skin/queued.svg</file>
+         <file>skin/ratio.svg</file>
+@@ -370,17 +316,12 @@
+         <file>skin/spacer.gif</file>
+         <file>skin/spinner-placeholder.gif</file>
+         <file>skin/spinner.gif</file>
+-        <file>skin/splash.png</file>
+         <file>skin/stalledDL.svg</file>
+         <file>skin/stalledUP.svg</file>
+         <file>skin/tabs.gif</file>
+         <file>skin/toolbox-divider.gif</file>
+-        <file>skin/toolbox-divider2.gif</file>
+         <file>skin/uploading.svg</file>
+         <file>slow.png</file>
+         <file>slow_off.png</file>
+-        <file>sphere.png</file>
+-        <file>sphere2.png</file>
+-        <file>url.png</file>
+     </qresource>
+ </RCC>

package/lean/qBittorrent/patches/002-add-autoban-function.patch

@@ -0,0 +1,807 @@
+--- a/src/base/bittorrent/peerinfo.cpp
++++ b/src/base/bittorrent/peerinfo.cpp
+@@ -186,11 +186,26 @@ PeerAddress PeerInfo::address() const
+                        m_nativeInfo.ip.port());
+ }
+ 
++int PeerInfo::port() const
++{
++    return m_nativeInfo.ip.port();
++}
++
+ QString PeerInfo::client() const
+ {
+     return QString::fromStdString(m_nativeInfo.client);
+ }
+ 
++QString PeerInfo::pid() const
++{
++    return QString::fromStdString(m_nativeInfo.pid.to_string());
++}
++
++QString PeerInfo::pidtoclient() const
++{
++    return QString::fromStdString(libt::identify_client(m_nativeInfo.pid));
++}
++
+ qreal PeerInfo::progress() const
+ {
+     return m_nativeInfo.progress;
+--- a/src/base/bittorrent/peerinfo.h
++++ b/src/base/bittorrent/peerinfo.h
+@@ -34,6 +34,7 @@
+ #include <QHostAddress>
+ 
+ #include <libtorrent/peer_info.hpp>
++#include <libtorrent/identify_client.hpp>
+ 
+ namespace BitTorrent
+ {
+@@ -85,7 +86,10 @@ namespace BitTorrent
+         bool isPlaintextEncrypted() const;
+ 
+         PeerAddress address() const;
++        int port() const;
+         QString client() const;
++        QString pid() const;
++        QString pidtoclient() const;
+         qreal progress() const;
+         int payloadUpSpeed() const;
+         int payloadDownSpeed() const;
+--- a/src/base/bittorrent/session.cpp
++++ b/src/base/bittorrent/session.cpp
+@@ -69,6 +69,7 @@
+ #endif
+ 
+ #include "base/algorithm.h"
++#include "base/bittorrent/peerinfo.h"
+ #include "base/exceptions.h"
+ #include "base/global.h"
+ #include "base/logger.h"
+@@ -335,6 +336,8 @@ Session::Session(QObject *parent)
+     , m_isAltGlobalSpeedLimitEnabled(BITTORRENT_SESSION_KEY("UseAlternativeGlobalSpeedLimit"), false)
+     , m_isBandwidthSchedulerEnabled(BITTORRENT_SESSION_KEY("BandwidthSchedulerEnabled"), false)
+     , m_saveResumeDataInterval(BITTORRENT_SESSION_KEY("SaveResumeDataInterval"), 60)
++    , m_autoBanUnknownPeer(BITTORRENT_SESSION_KEY("AutoBanUnknownPeer"), true)
++    , m_showTrackerAuthWindow(BITTORRENT_SESSION_KEY("ShowTrackerAuthWindow"), true)
+     , m_port(BITTORRENT_SESSION_KEY("Port"), 8999)
+     , m_useRandomPort(BITTORRENT_SESSION_KEY("UseRandomPort"), false)
+     , m_networkInterface(BITTORRENT_SESSION_KEY("Interface"))
+@@ -502,6 +505,7 @@ Session::Session(QObject *parent)
+         libt::ip_filter filter;
+         processBannedIPs(filter);
+         m_nativeSession->set_ip_filter(filter);
++        loadOfflineFilter();
+     }
+ 
+     m_categories = map_cast(m_storedCategories);
+@@ -518,6 +522,17 @@ Session::Session(QObject *parent)
+     connect(m_refreshTimer, &QTimer::timeout, this, &Session::refresh);
+     m_refreshTimer->start();
+ 
++    // Unban Timer
++    m_unbanTimer = new QTimer(this);
++    m_unbanTimer->setInterval(500);
++    connect(m_unbanTimer, &QTimer::timeout, this, &Session::processUnbanRequest);
++
++    // Ban Timer
++    m_banTimer = new QTimer(this);
++    m_banTimer->setInterval(500);
++    connect(m_banTimer, &QTimer::timeout, this, &Session::autoBanBadClient);
++    m_banTimer->start();
++
+     m_statistics = new Statistics(this);
+ 
+     updateSeedingLimitTimer();
+@@ -1077,6 +1092,7 @@ void Session::configure()
+             enableIPFilter();
+         else
+             disableIPFilter();
++        loadOfflineFilter();
+         m_IPFilteringChanged = false;
+     }
+ 
+@@ -1905,6 +1921,95 @@ void Session::banIP(const QString &ip)
+     }
+ }
+ 
++bool Session::checkAccessFlags(const QString &ip)
++{
++    libt::ip_filter filter = m_nativeSession->get_ip_filter();
++    boost::system::error_code ec;
++    libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec);
++    Q_ASSERT(!ec);
++    if (ec) return false;
++    return filter.access(addr);
++}
++
++void Session::tempblockIP(const QString &ip)
++{
++    libt::ip_filter filter = m_nativeSession->get_ip_filter();
++    boost::system::error_code ec;
++    libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec);
++    Q_ASSERT(!ec);
++    if (ec) return;
++    filter.add_rule(addr, addr, libt::ip_filter::blocked);
++    m_nativeSession->set_ip_filter(filter);
++    insertQueue(ip);
++}
++
++void Session::removeBlockedIP(const QString &ip)
++{
++    libt::ip_filter filter = m_nativeSession->get_ip_filter();
++    boost::system::error_code ec;
++    libt::address addr = libt::address::from_string(ip.toLatin1().constData(), ec);
++    Q_ASSERT(!ec);
++    if (ec) return;
++    filter.add_rule(addr, addr, 0);
++    m_nativeSession->set_ip_filter(filter);
++}
++
++void Session::eraseIPFilter()
++{
++    q_bannedIPs.clear();
++    q_unbanTime.clear();
++    if (isIPFilteringEnabled()) {
++        enableIPFilter();
++    } else {
++        disableIPFilter();
++        loadOfflineFilter();
++    }
++}
++
++void Session::autoBanBadClient()
++{
++    const BitTorrent::SessionStatus tStatus = BitTorrent::Session::instance()->status();
++    if (tStatus.peersCount > 0) {
++        bool m_AutoBan = BitTorrent::Session::instance()->isAutoBanUnknownPeerEnabled();
++        foreach (BitTorrent::TorrentHandle *const torrent, BitTorrent::Session::instance()->torrents()) {
++            QList<BitTorrent::PeerInfo> peers = torrent->peers();
++            foreach (const BitTorrent::PeerInfo &peer, peers) {
++                BitTorrent::PeerAddress addr = peer.address();
++                if (addr.ip.isNull()) continue;
++                QString ip = addr.ip.toString();
++                int port = peer.port();
++                QString client = peer.client();
++                QString ptoc = peer.pidtoclient();
++                QString pid = peer.pid().left(8);
++                QString country = peer.country();
++
++                QRegExp IDFilter("-(XL|SD|XF|QD|BN|DL)(\\d+)-");
++                QRegExp UAFilter("\\d+.\\d+.\\d+.\\d+");
++                if (IDFilter.exactMatch(pid) || UAFilter.exactMatch(client)) {
++                    qDebug("Auto Banning bad Peer %s...", ip.toLocal8Bit().data());
++                    Logger::instance()->addMessage(tr("Auto banning bad Peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(pid).arg(ptoc).arg(country));
++                    tempblockIP(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));
++                        tempblockIP(ip);
++                        continue;
++                    }
++                    if (port >= 65000 && country == "CN" && client.contains("Transmission")) {
++                        qDebug("Auto Banning Offline Downloader %s...", ip.toLocal8Bit().data());
++                        Logger::instance()->addMessage(tr("Auto banning Offline Downloader '%1:%2'...'%3'...'%4'...'%5'").arg(ip).arg(port).arg(pid).arg(ptoc).arg(country));
++                        tempblockIP(ip);
++                    }
++                }
++            }
++        }
++    }
++}
++
+ // Delete a torrent from the session, given its hash
+ // deleteLocalFiles = true means that the torrent will be removed from the hard-drive too
+ bool Session::deleteTorrent(const QString &hash, bool deleteLocalFiles)
+@@ -2787,6 +2892,30 @@ void Session::setSaveResumeDataInterval(
+     }
+ }
+ 
++bool Session::isAutoBanUnknownPeerEnabled() const
++{
++    return m_autoBanUnknownPeer;
++}
++
++void Session::setAutoBanUnknownPeer(bool value)
++{
++    if (value != isAutoBanUnknownPeerEnabled()) {
++        m_autoBanUnknownPeer = value;
++    }
++}
++
++bool Session::isShowTrackerAuthWindow() const
++{
++    return m_showTrackerAuthWindow;
++}
++
++void Session::setShowTrackerAuthWindow(bool value)
++{
++    if (value != isShowTrackerAuthWindow()) {
++        m_showTrackerAuthWindow = value;
++    }
++}
++
+ int Session::port() const
+ {
+     static int randomPort = Utils::Random::rand(1024, 65535);
+@@ -3877,6 +4006,220 @@ void Session::disableIPFilter()
+     m_nativeSession->set_ip_filter(filter);
+ }
+ 
++// Insert banned IP to Queue
++void Session::insertQueue(QString ip)
++{
++    q_bannedIPs.enqueue(ip);
++    q_unbanTime.enqueue(QDateTime::currentMSecsSinceEpoch() + 60 * 60 * 1000);
++
++    if (!m_unbanTimer->isActive()) {
++        m_unbanTimer->start();
++    }
++}
++
++// Process Unban Queue
++void Session::processUnbanRequest()
++{
++    if (q_bannedIPs.isEmpty() && q_unbanTime.isEmpty()) {
++        m_unbanTimer->stop();
++    }
++    else if (m_isActive) {
++        return;
++    }
++    else {
++        m_isActive = true;
++        int64_t currentTime = QDateTime::currentMSecsSinceEpoch();
++        int64_t nextTime = q_unbanTime.dequeue();
++        int delayTime = int(nextTime - currentTime);
++        QString nextIP = q_bannedIPs.dequeue();
++        if (delayTime < 0) {
++            QTimer::singleShot(0, [=] { BitTorrent::Session::instance()->removeBlockedIP(nextIP); m_isActive = false; });
++        }
++        else {
++            QTimer::singleShot(delayTime, [=] { BitTorrent::Session::instance()->removeBlockedIP(nextIP); m_isActive = false; });
++        }
++    }
++}
++
++// Handle ipfilter.dat
++int trim(char* const data, int start, int end)
++{
++    if (start >= end) return start;
++    int newStart = start;
++
++    for (int i = start; i <= end; ++i) {
++        if (isspace(data[i]) != 0) {
++            data[i] = '\0';
++        }
++        else {
++            newStart = i;
++            break;
++        }
++    }
++
++    for (int i = end; i >= start; --i) {
++        if (isspace(data[i]) != 0)
++            data[i] = '\0';
++        else
++            break;
++    }
++
++    return newStart;
++}
++
++int findAndNullDelimiter(char *const data, char delimiter, int start, int end)
++{
++    for (int i = start; i <= end; ++i) {
++        if (data[i] == delimiter) {
++            data[i] = '\0';
++            return i;
++        }
++    }
++
++    return -1;
++}
++
++int Session::parseOfflineFilterFile(QString ipDat, libt::ip_filter &filter)
++{
++    int ruleCount = 0;
++    QFile file(ipDat);
++    if (!file.exists()) return ruleCount;
++
++    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
++        LogMsg(tr("I/O Error: Could not open IP filter file in read mode."), Log::CRITICAL);
++        return ruleCount;
++    }
++
++    std::vector<char> buffer(2 * 1024 * 1024, 0); // seems a bit faster than QVector
++    qint64 bytesRead = 0;
++    int offset = 0;
++    int start = 0;
++    int endOfLine = -1;
++    int nbLine = 0;
++
++    while (true) {
++        bytesRead = file.read(buffer.data() + offset, 2 * 1024 * 1024 - offset - 1);
++        if (bytesRead < 0)
++            break;
++        int dataSize = bytesRead + offset;
++        if (bytesRead == 0 && dataSize == 0)
++            break;
++
++        for (start = 0; start < dataSize; ++start) {
++            endOfLine = -1;
++            // The file might have ended without the last line having a newline
++            if (!(bytesRead == 0 && dataSize > 0)) {
++                for (int i = start; i < dataSize; ++i) {
++                    if (buffer[i] == '\n') {
++                        endOfLine = i;
++                        // We need to NULL the newline in case the line has only an IP range.
++                        // In that case the parser won't work for the end IP, because it ends
++                        // with the newline and not with a number.
++                        buffer[i] = '\0';
++                        break;
++                    }
++                }
++            }
++            else {
++                endOfLine = dataSize;
++                buffer[dataSize] = '\0';
++            }
++
++            if (endOfLine == -1) {
++                // read the next chunk from file
++                // but first move(copy) the leftover data to the front of the buffer
++                offset = dataSize - start;
++                memmove(buffer.data(), buffer.data() + start, offset);
++                break;
++            }
++            else {
++                ++nbLine;
++            }
++
++            if ((buffer[start] == '#')
++                || ((buffer[start] == '/') && ((start + 1 < dataSize) && (buffer[start + 1] == '/')))) {
++                start = endOfLine;
++                continue;
++            }
++
++            // Each line should follow this format:
++            // 001.009.096.105 - 001.009.096.105 , 000 , Some organization
++            // The 3rd entry is access level and if above 127 the IP range isn't blocked.
++            int firstComma = findAndNullDelimiter(buffer.data(), ',', start, endOfLine);
++            if (firstComma != -1)
++                findAndNullDelimiter(buffer.data(), ',', firstComma + 1, endOfLine);
++
++            // Check if there is an access value (apparently not mandatory)
++            if (firstComma != -1) {
++                // There is possibly one
++                const long int nbAccess = strtol(buffer.data() + firstComma + 1, nullptr, 10);
++                // Ignoring this rule because access value is too high
++                if (nbAccess > 127L) {
++                    start = endOfLine;
++                    continue;
++                }
++            }
++
++            // IP Range should be split by a dash
++            int endOfIPRange = ((firstComma == -1) ? (endOfLine - 1) : (firstComma - 1));
++            int delimIP = findAndNullDelimiter(buffer.data(), '-', start, endOfIPRange);
++            if (delimIP == -1) {
++                start = endOfLine;
++                continue;
++            }
++
++            boost::system::error_code ec;
++            int newStart = trim(buffer.data(), start, delimIP - 1);
++            libt::address startAddr = libt::address::from_string(buffer.data() + newStart, ec);
++            Q_ASSERT(!ec);
++            if (ec) {
++                start = endOfLine;
++                continue;
++            }
++
++            newStart = trim(buffer.data(), delimIP + 1, endOfIPRange);
++            libt::address endAddr = libt::address::from_string(buffer.data() + newStart, ec);
++            Q_ASSERT(!ec);
++            if (ec) {
++                start = endOfLine;
++                continue;
++            }
++
++            if ((startAddr.is_v4() != endAddr.is_v4())
++                || (startAddr.is_v6() != endAddr.is_v6())) {
++                start = endOfLine;
++                continue;
++            }
++
++            start = endOfLine;
++
++            filter.add_rule(startAddr, endAddr, libt::ip_filter::blocked);
++            ++ruleCount;
++        }
++
++        if (start >= dataSize)
++            offset = 0;
++    }
++
++    return ruleCount;
++}
++
++void Session::loadOfflineFilter() {
++    int Count = 0;
++    libt::ip_filter offlineFilter = m_nativeSession->get_ip_filter();
++
++#if defined(Q_OS_WIN)
++    Count = parseOfflineFilterFile("./ipfilter.dat", offlineFilter);
++#endif
++
++#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
++    Count = parseOfflineFilterFile(QDir::home().absoluteFilePath(".config")+"/qBittorrent/ipfilter.dat", offlineFilter);
++#endif
++
++    m_nativeSession->set_ip_filter(offlineFilter);
++    Logger::instance()->addMessage(tr("Successfully parsed the offline downloader IP filter: %1 rules were applied.", "%1 is a number").arg(Count));
++}
++
+ void Session::recursiveTorrentDownload(const InfoHash &hash)
+ {
+     TorrentHandle *const torrent = m_torrents.value(hash);
+@@ -4063,6 +4406,7 @@ void Session::handleIPFilterParsed(int r
+     }
+     Logger::instance()->addMessage(tr("Successfully parsed the provided IP filter: %1 rules were applied.", "%1 is a number").arg(ruleCount));
+     emit IPFilterParsed(false, ruleCount);
++    loadOfflineFilter();
+ }
+ 
+ void Session::handleIPFilterError()
+--- a/src/base/bittorrent/session.h
++++ b/src/base/bittorrent/session.h
+@@ -40,8 +40,10 @@
+ #include <QMap>
+ #include <QNetworkConfigurationManager>
+ #include <QPointer>
++#include <QQueue>
+ #include <QSet>
+ #include <QStringList>
++#include <QTimer>
+ #include <QVector>
+ #include <QWaitCondition>
+ 
+@@ -341,6 +343,10 @@ namespace BitTorrent
+ 
+         uint saveResumeDataInterval() const;
+         void setSaveResumeDataInterval(uint value);
++        bool isAutoBanUnknownPeerEnabled() const;
++        void setAutoBanUnknownPeer(bool value);
++        bool isShowTrackerAuthWindow() const;
++        void setShowTrackerAuthWindow(bool value);
+         int port() const;
+         void setPort(int port);
+         bool useRandomPort() const;
+@@ -467,6 +473,19 @@ namespace BitTorrent
+         void setMaxRatioAction(MaxRatioAction act);
+ 
+         void banIP(const QString &ip);
++        bool checkAccessFlags(const QString &ip);
++        void tempblockIP(const QString &ip);
++        void removeBlockedIP(const QString &ip);
++        void eraseIPFilter();
++        void autoBanBadClient();
++
++        // Unban Timer
++        bool m_isActive = false;
++        QQueue<QString> q_bannedIPs;
++        QQueue<int64_t> q_unbanTime;
++        QTimer *m_unbanTimer;
++        QTimer *m_banTimer;
++        void insertQueue(QString ip);
+ 
+         bool isKnownTorrent(const InfoHash &hash) const;
+         bool addTorrent(QString source, const AddTorrentParams &params = AddTorrentParams());
+@@ -546,6 +565,9 @@ namespace BitTorrent
+         void tagAdded(const QString &tag);
+         void tagRemoved(const QString &tag);
+ 
++    public slots:
++        void processUnbanRequest();
++
+     private slots:
+         void configureDeferred();
+         void readAlerts();
+@@ -601,6 +623,8 @@ namespace BitTorrent
+         void populateAdditionalTrackers();
+         void enableIPFilter();
+         void disableIPFilter();
++        int parseOfflineFilterFile(QString ipDat, libtorrent::ip_filter &filter);
++        void loadOfflineFilter();
+ 
+         bool addTorrent_impl(CreateTorrentParams params, const MagnetUri &magnetUri,
+                              TorrentInfo torrentInfo = TorrentInfo(),
+@@ -713,6 +737,8 @@ namespace BitTorrent
+         CachedSettingValue<bool> m_isAltGlobalSpeedLimitEnabled;
+         CachedSettingValue<bool> m_isBandwidthSchedulerEnabled;
+         CachedSettingValue<uint> m_saveResumeDataInterval;
++        CachedSettingValue<bool> m_autoBanUnknownPeer;
++        CachedSettingValue<bool> m_showTrackerAuthWindow;
+         CachedSettingValue<int> m_port;
+         CachedSettingValue<bool> m_useRandomPort;
+         CachedSettingValue<QString> m_networkInterface;
+--- a/src/base/bittorrent/torrenthandle.cpp
++++ b/src/base/bittorrent/torrenthandle.cpp
+@@ -1561,7 +1561,8 @@ void TorrentHandle::handleTrackerErrorAl
+     m_trackerInfos[trackerUrl].lastMessage = message;
+ 
+     if (p->status_code == 401)
+-        m_session->handleTorrentTrackerAuthenticationRequired(this, trackerUrl);
++        if (Preferences::instance()->getShowTrackerAuthWindow())
++            m_session->handleTorrentTrackerAuthenticationRequired(this, trackerUrl);
+ 
+     m_session->handleTorrentTrackerError(this, trackerUrl);
+ }
+--- a/src/base/preferences.cpp
++++ b/src/base/preferences.cpp
+@@ -1090,6 +1090,26 @@ void Preferences::setTrayIconStyle(TrayI
+ }
+ #endif
+ 
++bool Preferences::getAutoBanUnknownPeer() const
++{
++    return value("Preferences/Advanced/AutoBanUnknownPeer", false).toBool();
++}
++
++void Preferences::setAutoBanUnknownPeer(const bool checked)
++{
++    setValue("Preferences/Advanced/AutoBanUnknownPeer", checked);
++}
++
++bool Preferences::getShowTrackerAuthWindow() const
++{
++    return value("Preferences/Advanced/ShowTrackerAuthWindow", true).toBool();
++}
++
++void Preferences::setShowTrackerAuthWindow(const bool checked)
++{
++    setValue("Preferences/Advanced/ShowTrackerAuthWindow", checked);
++}
++
+ // Stuff that don't appear in the Options GUI but are saved
+ // in the same file.
+ 
+--- a/src/base/preferences.h
++++ b/src/base/preferences.h
+@@ -300,6 +300,10 @@ public:
+     TrayIcon::Style trayIconStyle() const;
+     void setTrayIconStyle(TrayIcon::Style style);
+ #endif // Q_OS_MAC
++    bool getAutoBanUnknownPeer() const;
++    void setAutoBanUnknownPeer(const bool checked);
++    bool getShowTrackerAuthWindow() const;
++    void setShowTrackerAuthWindow(const bool checked);
+ 
+     // Stuff that don't appear in the Options GUI but are saved
+     // in the same file.
+--- a/src/base/settingsstorage.cpp
++++ b/src/base/settingsstorage.cpp
+@@ -91,6 +91,8 @@ namespace
+             {"BitTorrent/Session/InterfaceName", "Preferences/Connection/InterfaceName"},
+             {"BitTorrent/Session/InterfaceAddress", "Preferences/Connection/InterfaceAddress"},
+             {"BitTorrent/Session/SaveResumeDataInterval", "Preferences/Downloads/SaveResumeDataInterval"},
++            {"BitTorrent/Session/AutoBanUnknownPeer", "Preferences/Advanced/AutoBanUnknownPeer"},
++            {"BitTorrent/Session/ShowTrackerAuthWindow", "Preferences/Advanced/ShowTrackerAuthWindow"},
+             {"BitTorrent/Session/Encryption", "Preferences/Bittorrent/Encryption"},
+             {"BitTorrent/Session/ForceProxy", "Preferences/Connection/ProxyForce"},
+             {"BitTorrent/Session/ProxyPeerConnections", "Preferences/Connection/ProxyPeerConnections"},
+--- a/src/gui/advancedsettings.cpp
++++ b/src/gui/advancedsettings.cpp
+@@ -60,6 +60,8 @@ enum AdvSettingsRows
+     NETWORK_LISTEN_IPV6,
+     // behavior
+     SAVE_RESUME_DATA_INTERVAL,
++    CONFIRM_AUTO_BAN,
++    SHOW_TRACKER_AUTH_WINDOW,
+     CONFIRM_RECHECK_TORRENT,
+     RECHECK_COMPLETED,
+ #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+@@ -215,6 +217,10 @@ void AdvancedSettings::saveAdvancedSetti
+     // Announce IP
+     QHostAddress addr(lineEditAnnounceIP.text().trimmed());
+     session->setAnnounceIP(addr.isNull() ? "" : addr.toString());
++    // Auto ban Unknown Peer
++    session->setAutoBanUnknownPeer(cb_auto_ban_unknown_peer.isChecked());
++    // Show Tracker Authenticaion Window
++    session->setShowTrackerAuthWindow(cb_show_tracker_auth_window.isChecked());
+ 
+     // Program notification
+     MainWindow *const mainWindow = static_cast<Application*>(QCoreApplication::instance())->mainWindow();
+@@ -465,6 +471,12 @@ void AdvancedSettings::loadAdvancedSetti
+     // Announce IP
+     lineEditAnnounceIP.setText(session->announceIP());
+     addRow(ANNOUNCE_IP, tr("IP Address to report to trackers (requires restart)"), &lineEditAnnounceIP);
++    // Auto Ban Unknown Peer from China
++    cb_auto_ban_unknown_peer.setChecked(session->isAutoBanUnknownPeerEnabled());
++    addRow(CONFIRM_AUTO_BAN, tr("Auto Ban Unknown Peer from China"), &cb_auto_ban_unknown_peer);
++    // Show Tracker Authenticaion Window
++    cb_show_tracker_auth_window.setChecked(session->isShowTrackerAuthWindow());
++    addRow(SHOW_TRACKER_AUTH_WINDOW, tr("Show Tracker Authenticaion Window"), &cb_show_tracker_auth_window);
+ 
+     // Program notifications
+     const MainWindow *const mainWindow = static_cast<Application*>(QCoreApplication::instance())->mainWindow();
+--- a/src/gui/advancedsettings.h
++++ b/src/gui/advancedsettings.h
+@@ -65,7 +65,8 @@ private:
+     QCheckBox checkBoxOsCache, checkBoxRecheckCompleted, checkBoxResolveCountries, checkBoxResolveHosts, checkBoxSuperSeeding,
+               checkBoxProgramNotifications, checkBoxTorrentAddedNotifications, checkBoxTrackerFavicon, checkBoxTrackerStatus,
+               checkBoxConfirmTorrentRecheck, checkBoxConfirmRemoveAllTags, checkBoxListenIPv6, checkBoxAnnounceAllTrackers, checkBoxAnnounceAllTiers,
+-              checkBoxGuidedReadCache, checkBoxMultiConnectionsPerIp, checkBoxSuggestMode, checkBoxCoalesceRW, checkBoxSpeedWidgetEnabled;
++              checkBoxGuidedReadCache, checkBoxMultiConnectionsPerIp, checkBoxSuggestMode, checkBoxCoalesceRW, checkBoxSpeedWidgetEnabled,
++              cb_auto_ban_unknown_peer, cb_show_tracker_auth_window;
+     QComboBox comboBoxInterface, comboBoxInterfaceAddress, comboBoxUtpMixedMode, comboBoxChokingAlgorithm, comboBoxSeedChokingAlgorithm;
+     QLineEdit lineEditAnnounceIP;
+ 
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -73,6 +73,7 @@
+ #include "addnewtorrentdialog.h"
+ #include "application.h"
+ #include "autoexpandabledialog.h"
++#include "base/bittorrent/peerinfo.h"
+ #include "cookiesdialog.h"
+ #include "downloadfromurldialog.h"
+ #include "executionlogwidget.h"
+--- a/src/gui/properties/peerlistdelegate.h
++++ b/src/gui/properties/peerlistdelegate.h
+@@ -49,6 +49,7 @@ public:
+         CONNECTION,
+         FLAGS,
+         CLIENT,
++        PEERID,
+         PROGRESS,
+         DOWN_SPEED,
+         UP_SPEED,
+--- a/src/gui/properties/peerlistwidget.cpp
++++ b/src/gui/properties/peerlistwidget.cpp
+@@ -75,6 +75,7 @@ PeerListWidget::PeerListWidget(Propertie
+     m_listModel->setHeaderData(PeerListDelegate::FLAGS, Qt::Horizontal, tr("Flags"));
+     m_listModel->setHeaderData(PeerListDelegate::CONNECTION, Qt::Horizontal, tr("Connection"));
+     m_listModel->setHeaderData(PeerListDelegate::CLIENT, Qt::Horizontal, tr("Client", "i.e.: Client application"));
++    m_listModel->setHeaderData(PeerListDelegate::PEERID, Qt::Horizontal, tr("Peer ID", "i.e.: Client Peer ID"));
+     m_listModel->setHeaderData(PeerListDelegate::PROGRESS, Qt::Horizontal, tr("Progress", "i.e: % downloaded"));
+     m_listModel->setHeaderData(PeerListDelegate::DOWN_SPEED, Qt::Horizontal, tr("Down Speed", "i.e: Download speed"));
+     m_listModel->setHeaderData(PeerListDelegate::UP_SPEED, Qt::Horizontal, tr("Up Speed", "i.e: Upload speed"));
+@@ -288,8 +289,13 @@ void PeerListWidget::banSelectedPeers()
+     for (const QModelIndex &index : selectedIndexes) {
+         int row = m_proxyModel->mapToSource(index).row();
+         QString ip = m_listModel->data(m_listModel->index(row, PeerListDelegate::IP_HIDDEN)).toString();
++        QString client = m_listModel->data(m_listModel->index(row, PeerListDelegate::CLIENT)).toString();
++        QString peerid = m_listModel->data(m_listModel->index(row, PeerListDelegate::PEERID)).toString();
++        QHostAddress host;
++        host.setAddress(ip);
++        const QString countryName = Net::GeoIPManager::CountryName(Net::GeoIPManager::instance()->lookup(host));
+         qDebug("Banning peer %s...", ip.toLocal8Bit().data());
+-        Logger::instance()->addMessage(tr("Manually banning peer '%1'...").arg(ip));
++        Logger::instance()->addMessage(tr("Manually banning peer '%1'...'%2'...'%3'...'%4'").arg(ip).arg(peerid).arg(client).arg(countryName));
+         BitTorrent::Session::instance()->banIP(ip);
+     }
+     // Refresh list
+@@ -398,6 +404,7 @@ QStandardItem *PeerListWidget::addPeer(c
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flags());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flagsDescription(), Qt::ToolTipRole);
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), peer.client().toHtmlEscaped());
++    m_listModel->setData(m_listModel->index(row, PeerListDelegate::PEERID), peer.pid().left(8).toHtmlEscaped());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::PROGRESS), peer.progress());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWN_SPEED), peer.payloadDownSpeed());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::UP_SPEED), peer.payloadUpSpeed());
+@@ -429,6 +436,7 @@ void PeerListWidget::updatePeer(const QS
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flags());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::FLAGS), peer.flagsDescription(), Qt::ToolTipRole);
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::CLIENT), peer.client().toHtmlEscaped());
++    m_listModel->setData(m_listModel->index(row, PeerListDelegate::PEERID), peer.pid().left(8).toHtmlEscaped());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::PROGRESS), peer.progress());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::DOWN_SPEED), peer.payloadDownSpeed());
+     m_listModel->setData(m_listModel->index(row, PeerListDelegate::UP_SPEED), peer.payloadUpSpeed());
+--- a/src/webui/api/appcontroller.cpp
++++ b/src/webui/api/appcontroller.cpp
+@@ -153,6 +153,7 @@ void AppController::preferencesAction()
+     data["ip_filter_path"] = Utils::Fs::toNativePath(session->IPFilterFile());
+     data["ip_filter_trackers"] = session->isTrackerFilteringEnabled();
+     data["banned_IPs"] = session->bannedIPs().join("\n");
++    data["auto_ban_unknown_peer"] = session->isAutoBanUnknownPeerEnabled();
+ 
+     // Speed
+     // Global Rate Limits
+@@ -401,6 +402,8 @@ void AppController::setPreferencesAction
+         session->setTrackerFilteringEnabled(m["ip_filter_trackers"].toBool());
+     if (m.contains("banned_IPs"))
+         session->setBannedIPs(m["banned_IPs"].toString().split('\n'));
++    if (m.contains("auto_ban_unknown_peer"))
++        session->setAutoBanUnknownPeer(m["auto_ban_unknown_peer"].toBool());
+ 
+     // Speed
+     // Global Rate Limits
+--- a/src/webui/api/transfercontroller.cpp
++++ b/src/webui/api/transfercontroller.cpp
+@@ -30,6 +30,7 @@
+ 
+ #include <QJsonObject>
+ 
++#include "base/logger.h"
+ #include "base/bittorrent/session.h"
+ 
+ const char KEY_TRANSFER_DLSPEED[] = "dl_info_speed";
+@@ -111,3 +112,37 @@ void TransferController::speedLimitsMode
+ {
+     setResult(QString::number(BitTorrent::Session::instance()->isAltGlobalSpeedLimitEnabled()));
+ }
++
++void TransferController::tempblockPeerAction()
++{
++    checkParams({"ip"});
++    QString ip = params()["ip"];
++    boost::system::error_code ec;
++    boost::asio::ip::address addr = boost::asio::ip::address::from_string(ip.toStdString(), ec);
++    bool isBanned = BitTorrent::Session::instance()->checkAccessFlags(QString::fromStdString(addr.to_string()));
++
++    if (ip.isEmpty()) {
++        setResult(QLatin1String("IP field should not be empty."));
++        return;
++    }
++
++    if (ec) {
++        setResult(QLatin1String("The given IP address is not valid."));
++        return;
++    }
++
++    if (isBanned) {
++        setResult(QLatin1String("The given IP address already exists."));
++        return;
++    }
++
++    BitTorrent::Session::instance()->tempblockIP(ip);
++    Logger::instance()->addMessage(tr("Peer '%1' banned via Web API.").arg(ip));
++    setResult(QLatin1String("Done."));
++}
++
++void TransferController::resetIPFilterAction()
++{
++    BitTorrent::Session::instance()->eraseIPFilter();
++    setResult(QLatin1String("Erased."));
++}
+--- a/src/webui/api/transfercontroller.h
++++ b/src/webui/api/transfercontroller.h
+@@ -46,4 +46,6 @@ private slots:
+     void downloadLimitAction();
+     void setUploadLimitAction();
+     void setDownloadLimitAction();
++    void tempblockPeerAction();
++    void resetIPFilterAction();
+ };
+--- a/src/webui/www/private/preferences_content.html
++++ b/src/webui/www/private/preferences_content.html
+@@ -377,6 +377,8 @@
+                 <textarea id="banned_IPs_textarea" rows="5" cols="70"></textarea>
+             </fieldset>
+         </div>
++        <input type="checkbox" id="auto_ban_unknown_peer_checkbox" />
++        <label for="auto_ban_unknown_peer_checkbox">QBT_TR(Auto Ban Unknown Client From China)QBT_TR[CONTEXT=OptionsDialog]</label>
+     </fieldset>
+ </div>
+ 
+@@ -1252,6 +1254,7 @@
+                     $('ipfilter_text').setProperty('value', pref.ip_filter_path);
+                     $('ipfilter_trackers_checkbox').setProperty('checked', pref.ip_filter_trackers);
+                     $('banned_IPs_textarea').setProperty('value', pref.banned_IPs);
++                    $('auto_ban_unknown_peer_checkbox').setProperty('checked', pref.auto_ban_unknown_peer);
+                     updateFilterSettings();
+ 
+                     // Speed tab
+@@ -1502,6 +1505,7 @@
+         settings.set('ip_filter_path', $('ipfilter_text').getProperty('value'));
+         settings.set('ip_filter_trackers', $('ipfilter_trackers_checkbox').getProperty('checked'));
+         settings.set('banned_IPs', $('banned_IPs_textarea').getProperty('value'));
++        settings.set('auto_ban_unknown_peer', $('auto_ban_unknown_peer_checkbox').getProperty('checked'));
+ 
+         // Speed tab
+         // Global Rate Limits