From 2f9a4bc2f0653f1b1d827d6d6a2d6647eb09ac37 Mon Sep 17 00:00:00 2001 From: juewuy Date: Wed, 4 May 2022 22:28:09 +0800 Subject: [PATCH] =?UTF-8?q?v1.5.9fix=20~=E4=BF=AE=E5=A4=8DPremium=E6=A0=B8?= =?UTF-8?q?=E6=B7=B7=E5=90=88+redir=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ~同步最新alpha版本meta内核 ~修复Tun模式 ~修复Meta内核混合模式 ~修复流媒体预解析打不开的bug ~修复各种DNS异常问题 ~优化启动速度 --- scripts/start.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 277a8b6..d3a2f71 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -298,7 +298,8 @@ modify_yaml(){ external="external-controller: 0.0.0.0:$db_port" [ -d $clashdir/ui ] && db_ui=ui if [ "$redir_mod" = "混合模式" -o "$redir_mod" = "Tun模式" ];then - tun="tun: {enable: true, stack: system, device: utun, auto-route: false}" + [ "$clashcore" = 'clash.meta' ] && tun_meta=', device: utun, auto-route: false' + tun="tun: {enable: true, stack: system$tun_meta}" else tun='tun: {enable: false}' fi @@ -477,6 +478,11 @@ start_redir(){ fi } start_dns(){ + #屏蔽OpenWrt内置53端口转发 + iptables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null + iptables -t nat -D PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null + ip6tables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null + ip6tables -t nat -D PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null #设置dns转发 iptables -t nat -N clash_dns if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then @@ -491,7 +497,7 @@ start_dns(){ done iptables -t nat -A clash_dns -p udp -j REDIRECT --to $dns_port fi - iptables -t nat -A PREROUTING -p udp --dport 53 -j clash_dns + iptables -t nat -I PREROUTING -p udp --dport 53 -j clash_dns #Google home DNS特殊处理 # iptables -t nat -I PREROUTING -p tcp -d 8.8.8.8 -j clash_dns # iptables -t nat -I PREROUTING -p tcp -d 8.8.4.4 -j clash_dns @@ -511,15 +517,11 @@ start_dns(){ done ip6tables -t nat -A clashv6_dns -p udp -j REDIRECT --to $dns_port fi - ip6tables -t nat -A PREROUTING -p udp --dport 53 -j clashv6_dns + ip6tables -t nat -I PREROUTING -p udp --dport 53 -j clashv6_dns else ip6tables -I INPUT -p udp --dport 53 -j REJECT > /dev/null 2>&1 fi - #屏蔽OpenWrt内置53端口转发 - iptables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null - iptables -t nat -D PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null - ip6tables -t nat -D PREROUTING -p udp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null - ip6tables -t nat -D PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53 2> /dev/null + } start_udp(){ ip rule add fwmark 1 table 100