From 52ec559100be6297a196f412c24eef528cb18496 Mon Sep 17 00:00:00 2001 From: juewuy Date: Mon, 21 Jun 2021 19:43:52 +0800 Subject: [PATCH] =?UTF-8?q?v1.4.0-pre-release=20~=E9=80=82=E9=85=8D?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8ax18=E7=AD=89=E4=BD=8E=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=86=85=E6=A0=B8=E8=AE=BE=E5=A4=87=20~=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=AC=E6=9C=BADocker=E4=BB=A3=E7=90=86(?= =?UTF-8?q?=E9=9C=80docker=E7=BD=91=E5=8D=A1=E8=AE=BE=E7=BD=AE=E4=B8=BAbri?= =?UTF-8?q?dge=E6=A8=A1=E5=BC=8F)=20~=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=85=AC=E7=BD=91=E8=AE=BF=E9=97=AEDashboard=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E5=8F=8A=E6=B7=B7=E5=90=88=E4=BB=A3=E7=90=86=E7=AB=AF=E5=8F=A3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20~=E5=A2=9E=E5=8A=A0clash=20-u=E5=8D=B8?= =?UTF-8?q?=E8=BD=BD=E5=91=BD=E4=BB=A4=20~=E4=BC=98=E5=8C=96=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=9C=BA=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=87=BA?= =?UTF-8?q?=E9=94=99bug=20~=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=8F=8A=E5=AE=89=E8=A3=85=E8=AF=B4=E6=98=8E=20~?= =?UTF-8?q?=E5=B1=80=E5=9F=9F=E7=BD=91=E8=BF=87=E6=BB=A4=E9=BB=91=E7=99=BD?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96=20~?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86DNS=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E9=85=8D=E7=BD=AE=E7=9A=84bug=20~=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=8A=E5=AE=89=E8=A3=85=E6=BA=90=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0HTTP=E4=B8=93?= =?UTF-8?q?=E5=B1=9E=E6=BA=90=EF=BC=88=E6=84=9F=E8=B0=A2=E9=85=B1=E7=B4=AB?= =?UTF-8?q?=E8=A1=A8=E5=90=8C=E5=AD=A6=E6=8F=90=E4=BE=9B=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=EF=BC=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/getdate.sh | 2 +- scripts/start.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/getdate.sh b/scripts/getdate.sh index 99466b4..07c68fb 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -932,7 +932,7 @@ userguide(){ [ "$res" = 1 ] && checkupdate && getcrt fi #设置加密DNS - $clashdir/start.sh webget /tmp/ssl_test https://baidu.com echooff rediron skipceroff + $clashdir/start.sh webget /tmp/ssl_test https://www,baidu.com echooff rediron skipceroff if [ "$?" = "0" ];then dns_nameserver='https://223.5.5.5/dns-query, https://doh.pub/dns-query, tls://dns.rubyfish.cn:853' dns_fallback='https://1.0.0.1/dns-query, https://8.8.4.4/dns-query, https://doh.opendns.com/dns-query' diff --git a/scripts/start.sh b/scripts/start.sh index 14e1ed4..000a0b4 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -327,6 +327,8 @@ start_redir(){ #Google home DNS特殊处理 iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 -j clash iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 -j clash + #Docker特殊处理 + iptables -t nat -I PREROUTING -s 172.16.0.0/12 -j clash #设置ipv6转发 ip6_nat=$(ip6tables -t nat -L 2>&1 | grep -o 'Chain') if [ -n "$ip6_nat" -a "$ipv6_support" = "已开启" ];then @@ -477,6 +479,7 @@ stop_iptables(){ iptables -t nat -D PREROUTING -p udp -j clash_dns 2> /dev/null iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash 2> /dev/null iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash 2> /dev/null + iptables -t nat -D PREROUTING -s 172.16.0.0/12 -j clash 2> /dev/null iptables -t nat -F clash 2> /dev/null iptables -t nat -X clash 2> /dev/null iptables -t nat -F clash_dns 2> /dev/null