Blcok ipv6 requests, switch README to English

twoone-3 · twoone-3 · commit e5b567fefa43 · 2024-07-25T17:26:43.000+08:00
diff --git a/README.md b/README.md
@@ -1,31 +1,33 @@
 # AdGuardHome for Magisk
-一个通过重定向并过滤 DNS 请求来屏蔽广告的 Magisk/KernelSU 模块
+English | [简体中文](README_zh.md)
+
+A Magisk/KernelSU module that blocks ads by redirecting and filtering DNS requests
 
 ![Static Badge](https://img.shields.io/badge/arm--64-support-blue)
+![Static Badge](https://img.shields.io/badge/arm--v7-support-blue)
 ![GitHub all releases](https://img.shields.io/github/downloads/twoone-3/AdguardHome/total)
 
-加入我们的 [Telegram](https://t.me/adguardhome_for_magisk_release) 频道获取最新信息以及FAQ
+Join our [Telegram](https://t.me/adguardhome_for_magisk_release) channel for the latest information and FAQ
 
-# 用法
-- 使用前需在设置里关闭 `私人/专用dns`，在 Magisk/KernelSU 刷入后重启即可使用，AdGuardHome 后台管理地址为 http://127.0.0.1:3000，用户名/密码root
-- 注意！本模块与可能与代理类模块冲突，同时使用两种模块会导致潜在问题！
+# Usage
+- Before using, turn off `Private DNS` in the settings, flash into Magisk/KernelSU and restart to use. The AdGuardHome background management address is http://127.0.0.1:3000, username/password root
+- Note! This module may conflict with proxy modules, using both modules at the same time may cause potential problems!
 
-# 特性
-- DNS 上游为腾讯阿里 DoT，备用 DNS 为 Google 和 CloudFlare
-- 仅内置[秋风广告规则](https://github.com/TG-Twilight/AWAvenue-Ads-Rule)，省电，少误杀
-- 可配合第三方软件进行启动停止，通过执行位于 /data/adb/modules/AdGuardHome/bin/ 的 apply_iptables.sh 和 flush_iptables.sh，这里给出Anywhere的快捷导入链接（复制到剪贴板即可导入）
-- 在 KernelSU 里可以通过打开按钮来打开管理页面
+# Features
+- The DNS upstream is Tencent Ali DoT, the backup DNS is Google and CloudFlare
+- Only built-in [AWAvenue-Ads-Rule](https://github.com/TG-Twilight/AWAvenue-Ads-Rule), power-saving, less false positives
+- Can be started and stopped with third-party software by executing apply_iptables.sh and flush_iptables.sh located in /data/adb/modules/AdGuardHome/bin/, here is the quick import link for Anywhere (copy to clipboard to import)
 
-Anywhere启动链接
+Anywhere start link
 ```
 anywhere://share/J2VP8X5qVhbI2sRvhZ6JXLZdx7Y6JLmsCgw9Wd7k7qce3ERvOaJlWHt61Y8oalvceraVdBkTbIymWLyhgxRQLeICFi3/GKuZYkqPJ3A6WQ8+xW4nTvmC9SwzER2X/9PFEtjgZsphvy2R8suN6BOE3Pm10gwmsdoLwCuLxs0uIA2VmP25Ur1GHTCogIgJoWBpJpz0QT1/LvBtNXXdFwkilQNF8VvcKAO3cgKns+I3hUk0T2rbsjVfj4UwxgYxi5Yg9yiV53hOzIzVZ9uZki3uy6TNTnThFXM+Hg88m8dron/cJM9Qg5Y979j0YTVrA9XakpnXKlF7UvaDM85FSjXZpkXCzbn00lWcvQ==
 ```
-Anywhere停止链接
+Anywhere stop link
 ```
 anywhere://share/J2VP8X5qVhbI2sRvhZ2hdp4467QzpcHDlkAQil7Mg6oDOLdzYgAJO+9fKKenP2M28XWZ71jveGDq1E/sCmMAhBqd5N04LZkJp0EYtrFp7Vw9xPsYBhlmwlaKWljr9iIAMGWOulpW7Zzhm/tpfaDIKjweOGfIsONgcoWq89Idmb215WTrhfju+OeoNqDicBqrOLI5iyI8fTCQifRm7m7hq53WMgN/BoYbWnyE34AeVO2hq5btVggCTBGunrftXnlweSY4ngaN8CmhTlDWQeyjMJRZMooTPHwcQm3fisvBY6McMaVV5lSLHBe+MNaK1EwnzQ0RjNJh/3eoVGQJgUUyN8swAmtakrwaNA==
 ```
 
-# 鸣谢
+# Acknowledgements
 - [AdguardHome_magisk](https://github.com/410154425/AdGuardHome_magisk)
 - [akashaProxy](https://github.com/ModuleList/akashaProxy)
 - [box_for_magisk](https://github.com/taamarin/box_for_magisk)
diff --git a/README_zh.md b/README_zh.md
@@ -0,0 +1,33 @@
+# AdGuardHome for Magisk
+[English](README.md) | 简体中文
+
+一个通过重定向并过滤 DNS 请求来屏蔽广告的 Magisk/KernelSU 模块
+
+![Static Badge](https://img.shields.io/badge/arm--64-support-blue)
+![Static Badge](https://img.shields.io/badge/arm--v7-support-blue)
+![GitHub all releases](https://img.shields.io/github/downloads/twoone-3/AdguardHome/total)
+
+加入我们的 [Telegram](https://t.me/adguardhome_for_magisk_release) 频道获取最新信息以及FAQ
+
+# 用法
+- 使用前需在设置里关闭 `私人/专用dns`，在 Magisk/KernelSU 刷入后重启即可使用，AdGuardHome 后台管理地址为 http://127.0.0.1:3000，用户名/密码root
+- 注意！本模块与可能与代理类模块冲突，同时使用两种模块会导致潜在问题！
+
+# 特性
+- DNS 上游为腾讯阿里 DoT，备用 DNS 为 Google 和 CloudFlare
+- 仅内置[秋风广告规则](https://github.com/TG-Twilight/AWAvenue-Ads-Rule)，省电，少误杀
+- 可配合第三方软件进行启动停止，通过执行位于 /data/adb/modules/AdGuardHome/bin/ 的 apply_iptables.sh 和 flush_iptables.sh，这里给出Anywhere的快捷导入链接（复制到剪贴板即可导入）
+
+Anywhere启动链接
+```
+anywhere://share/J2VP8X5qVhbI2sRvhZ6JXLZdx7Y6JLmsCgw9Wd7k7qce3ERvOaJlWHt61Y8oalvceraVdBkTbIymWLyhgxRQLeICFi3/GKuZYkqPJ3A6WQ8+xW4nTvmC9SwzER2X/9PFEtjgZsphvy2R8suN6BOE3Pm10gwmsdoLwCuLxs0uIA2VmP25Ur1GHTCogIgJoWBpJpz0QT1/LvBtNXXdFwkilQNF8VvcKAO3cgKns+I3hUk0T2rbsjVfj4UwxgYxi5Yg9yiV53hOzIzVZ9uZki3uy6TNTnThFXM+Hg88m8dron/cJM9Qg5Y979j0YTVrA9XakpnXKlF7UvaDM85FSjXZpkXCzbn00lWcvQ==
+```
+Anywhere停止链接
+```
+anywhere://share/J2VP8X5qVhbI2sRvhZ2hdp4467QzpcHDlkAQil7Mg6oDOLdzYgAJO+9fKKenP2M28XWZ71jveGDq1E/sCmMAhBqd5N04LZkJp0EYtrFp7Vw9xPsYBhlmwlaKWljr9iIAMGWOulpW7Zzhm/tpfaDIKjweOGfIsONgcoWq89Idmb215WTrhfju+OeoNqDicBqrOLI5iyI8fTCQifRm7m7hq53WMgN/BoYbWnyE34AeVO2hq5btVggCTBGunrftXnlweSY4ngaN8CmhTlDWQeyjMJRZMooTPHwcQm3fisvBY6McMaVV5lSLHBe+MNaK1EwnzQ0RjNJh/3eoVGQJgUUyN8swAmtakrwaNA==
+```
+
+# 鸣谢
+- [AdguardHome_magisk](https://github.com/410154425/AdGuardHome_magisk)
+- [akashaProxy](https://github.com/ModuleList/akashaProxy)
+- [box_for_magisk](https://github.com/taamarin/box_for_magisk)
diff --git a/apply_iptables.sh b/apply_iptables.sh
@@ -5,4 +5,7 @@ iptables -t nat -A ADGUARD -m owner --uid-owner root --gid-owner net_raw -j RETU
 iptables -t nat -A ADGUARD -p udp --dport 53 -j REDIRECT --to-ports 5591
 iptables -t nat -A ADGUARD -p tcp --dport 53 -j REDIRECT --to-ports 5591
 # apply iptables rules
-iptables -t nat -A OUTPUT -j ADGUARD
+iptables -t nat -A OUTPUT -j ADGUARD
+# block ipv6 DNS requests
+ip6tables -t filter -A OUTPUT -p tcp --dport 53 -j REJECT
+ip6tables -t filter -A OUTPUT -p udp --dport 53 -j REJECT
diff --git a/bin/AdGuardHome.yaml b/bin/AdGuardHome.yaml
@@ -62,7 +62,7 @@ dns:
   bootstrap_prefer_ipv6: false
   upstream_timeout: 10s
   private_networks: []
-  use_private_ptr_resolvers: true
+  use_private_ptr_resolvers: false
   local_ptr_upstreams: []
   use_dns64: false
   dns64_prefixes: []
diff --git a/flush_iptables.sh b/flush_iptables.sh
@@ -1,3 +1,5 @@
 iptables -t nat -D OUTPUT -j ADGUARD
 iptables -t nat -F ADGUARD
-iptables -t nat -X ADGUARD
+iptables -t nat -X ADGUARD
+ip6tables -t filter -D OUTPUT -p tcp --dport 53 -j REJECT
+ip6tables -t filter -D OUTPUT -p udp --dport 53 -j REJECT
diff --git a/module.prop b/module.prop
@@ -1,6 +1,6 @@
 id=AdGuardHome
 name=AdGuardHome for Magisk
-version=20240721
-versionCode=13
+version=20240725
+versionCode=14
 author=twoone3
 description=Filter ads at the DNS level
diff --git a/service.sh b/service.sh
@@ -1,6 +1,7 @@
 MODDIR="${0%/*}"
 ADG_DIR="$MODDIR/bin"
 
+sleep 10
 SSL_CERT_DIR="/system/etc/security/cacerts/" setuidgid root:net_raw "$ADG_DIR/AdGuardHome" >>"$ADG_DIR/AdGuardHome.log" 2>&1 &
 
 "$MODDIR/apply_iptables.sh"
diff --git a/webroot/index.html b/webroot/index.html
