diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index d987530..1d91e64 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 30de823..60aac19 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 8ba91ba..202720c 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index bd18d9c..983de88 100644 --- a/bin/version +++ b/bin/version @@ -4,5 +4,5 @@ clash_v=v1.7.1 meta_v=v1.18.1 singboxp_v=1.8.5-73d97226 singbox_v=1.8.8 -versionsh=1.9.1alpha4 +versionsh=1.9.1alpha5 GeoIP_v=20240302 diff --git a/scripts/init.sh b/scripts/init.sh index 6ab7038..9500660 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.9.1alpha4 +version=1.9.1alpha5 setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index a85cec5..bb43eaa 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -846,11 +846,11 @@ cn_ip_route(){ #CN-IP绕过 ckgeo cn_ip.txt china_ip_list.txt [ -f ${BINDIR}/cn_ip.txt ] && [ "$firewall_mod" = iptables ] && { # see https://raw.githubusercontent.com/Hackl0us/GeoIP2-CN/release/CN-ip-cidr.txt - echo "create cn_ip hash:net family inet hashsize 10240 maxelem 10240" > ${TMPDIR}/cn_$USER.ipset - awk '!/^$/&&!/^#/{printf("add cn_ip %s'" "'\n",$0)}' ${BINDIR}/cn_ip.txt >> ${TMPDIR}/cn_$USER.ipset + echo "create cn_ip hash:net family inet hashsize 10240 maxelem 10240" > ${TMPDIR}/cn_ip.ipset + awk '!/^$/&&!/^#/{printf("add cn_ip %s'" "'\n",$0)}' ${BINDIR}/cn_ip.txt >> ${TMPDIR}/cn_ip.ipset ipset -! flush cn_ip 2>/dev/null - ipset -! restore < ${TMPDIR}/cn_$USER.ipset 2>/dev/null - rm -rf cn_$USER.ipset + ipset -! restore < ${TMPDIR}/cn_ip.ipset + rm -rf ${TMPDIR}/cn_ip.ipset } } cn_ipv6_route(){ #CN-IPV6绕过 @@ -858,11 +858,11 @@ cn_ipv6_route(){ #CN-IPV6绕过 [ -f ${BINDIR}/cn_ipv6.txt ] && [ "$firewall_mod" = iptables ] && { #ipv6 #see https://ispip.clang.cn/all_cn_ipv6.txt - echo "create cn_ip6 hash:net family inet6 hashsize 4096 maxelem 4096" > ${TMPDIR}/cn6_$USER.ipset - awk '!/^$/&&!/^#/{printf("add cn_ip6 %s'" "'\n",$0)}' ${BINDIR}/cn_ipv6.txt >> ${TMPDIR}/cn6_$USER.ipset + echo "create cn_ip6 hash:net family inet6 hashsize 5120 maxelem 5120" > ${TMPDIR}/cn_ipv6.ipset + awk '!/^$/&&!/^#/{printf("add cn_ip6 %s'" "'\n",$0)}' ${BINDIR}/cn_ipv6.txt >> ${TMPDIR}/cn_ipv6.ipset ipset -! flush cn_ip6 2>/dev/null - ipset -! restore < ${TMPDIR}/cn6_$USER.ipset 2>/dev/null - rm -rf cn6_$USER.ipset + ipset -! restore < ${TMPDIR}/cn_ipv6.ipset + rm -rf ${TMPDIR}/cn_ipv6.ipset } } start_ipt_route(){ #iptables-route通用工具 @@ -890,8 +890,8 @@ start_ipt_route(){ #iptables-route通用工具 $1 -t $2 -A $4 -d $ip -j RETURN done #绕过CN_IP - [ "$dns_mod" != "fake-ip" -a "$cn_ip_route" = "已开启" ] && \ - $1 -t $2 -A $4 -m set --match-set cn_ip dst -j RETURN 2>/dev/null + [ "$1" = iptables ] && [ "$dns_mod" != "fake-ip" ] && [ "$cn_ip_route" = "已开启" ] && [ -f ${BINDIR}/cn_ip.txt ] && $1 -t $2 -A $4 -m set --match-set cn_ip dst -j RETURN 2>/dev/null + [ "$1" = ip6tables ] && [ "$dns_mod" != "fake-ip" ] && [ "$cn_ipv6_route" = "已开启" ] && [ -f ${BINDIR}/cn_ipv6.txt ] && $1 -t $2 -A $4 -m set --match-set cn_ip6 dst -j RETURN 2>/dev/null #局域网mac地址黑名单过滤 [ "$3" = 'PREROUTING' ] && [ -s "$(cat ${CRASHDIR}/configs/mac)" ] && [ "$macfilter_type" != "白名单" ] && { for mac in $(cat ${CRASHDIR}/configs/mac); do