diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index ac9d97a..0953c2c 100644 Binary files a/bin/ShellCrash.tar.gz and b/bin/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index f9c571e..78d5345 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz index 94efa72..679fced 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index 2c5a6ed..3d318ff 100644 --- a/bin/version +++ b/bin/version @@ -5,4 +5,4 @@ meta_v=v1.18.0 singbox_v=1.7.8 GeoIP_v=20240127 -versionsh=1.8.9b +versionsh=1.8.9c diff --git a/scripts/init.sh b/scripts/init.sh index 69abb94..d03e4c2 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.8.9b +version=1.8.9c setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index 631f713..75000f0 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -741,7 +741,7 @@ EOF mv -f ${TMPDIR}/jsons/${char}.json ${TMPDIR}/jsons_base #如果重复则临时备份 } done - for char in inbounds outbounds outbound_providers route;do + for char in inbounds outbounds outbound_providers route rule-set;do [ -s ${CRASHDIR}/jsons/${char}.json ] && { ln -s ${CRASHDIR}/jsons/${char}.json ${TMPDIR}/jsons/cust_${char}.json } @@ -1127,7 +1127,7 @@ start_nft(){ #nftables-allinone #仅代理本机局域网网段流量 nft add rule inet shellcrash prerouting ip saddr != {$HOST_IP} return #绕过CN-IP - [ "$dns_mod" = "redir_host" -a "$cn_ip_route" = "已开启" -a -f ${BINDIR}/cn_ip.txt ] && { + [ "$dns_mod" != "fake-ip" -a "$cn_ip_route" = "已开启" -a -f ${BINDIR}/cn_ip.txt ] && { CN_IP=$(awk '{printf "%s, ",$1}' ${BINDIR}/cn_ip.txt) [ -n "$CN_IP" ] && nft add rule inet shellcrash prerouting ip daddr {$CN_IP} return } @@ -1144,7 +1144,7 @@ start_nft(){ #nftables-allinone #仅代理本机局域网网段流量 nft add rule inet shellcrash prerouting ip6 saddr != {$HOST_IP6} return #绕过CN_IPV6 - [ "$dns_mod" = "redir_host" -a "$cn_ipv6_route" = "已开启" -a -f ${BINDIR}/cn_ipv6.txt ] && { + [ "$dns_mod" != "fake-ip" -a "$cn_ipv6_route" = "已开启" -a -f ${BINDIR}/cn_ipv6.txt ] && { CN_IP6=$(awk '{printf "%s, ",$1}' ${BINDIR}/cn_ipv6.txt) [ -n "$CN_IP6" ] && nft add rule inet shellcrash prerouting ip6 daddr {$CN_IP6} return }