xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-07-25 00:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1301 from abcfy2/fix/ecs-dns-empty-client-subnet

Browse Source 
修复 singbox 内核 ECS 获取失败导致启动 FATAL
This commit is contained in:
juewuy
2026-07-13 14:09:30 +08:00
committed by GitHub
parent 732d17087e c4532c979f
commit 3c838f2dda
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/libs/get_ecsip.sh
View File

@@ -6,8 +6,9 @@ get_ecs_address() {
[ -n "$ip" ] && return [ -n "$ip" ] && return
done done
. "$CRASHDIR"/libs/web_get_lite.sh . "$CRASHDIR"/libs/web_get_lite.sh
for web in http://members.3322.org/dyndns/getip http://4.ipw.cn http://ipinfo.io/ip; do #轮询公网IP，提取并校验为合法IPv4才采用，否则继续尝试下一个
ip=$(web_get_lite "$web" 0) for web in http://ddns.oray.com/checkip http://members.3322.org/dyndns/getip http://ipinfo.io/ip; do
ip=$(web_get_lite "$web" 0 | grep -oE '([0-9]{1,3}\.){3}[0-9]{1,3}' | tail -1)
[ -n "$ip" ] && return [ -n "$ip" ] && return
done done
} }

2
scripts/starts/clash_modify.sh
View File

@@ -21,7 +21,7 @@ prepare_clash_base_config() {
if [ -n "$ecs_address" ];then if [ -n "$ecs_address" ];then
dns_fallback=$(echo "$dns_fallback, " | sed "s|, |#ecs-override=true\&ecs=$ecs_address, |g" | sed 's|, $||') dns_fallback=$(echo "$dns_fallback, " | sed "s|, |#ecs-override=true\&ecs=$ecs_address, |g" | sed 's|, $||')
else else
logger "自动获取ecs网段失败！" logger "自动获取ecs网段失败！" 33
fi fi
} }
} }

6
scripts/starts/singbox_modify.sh
View File

@@ -113,7 +113,11 @@ prepare_dns_config() {
#ecs优化 #ecs优化
[ "$ecs_subnet" = ON ] && { [ "$ecs_subnet" = ON ] && {
. "$CRASHDIR"/libs/get_ecsip.sh . "$CRASHDIR"/libs/get_ecsip.sh
client_subnet='"client_subnet": "'"$ecs_address"'",' if [ -n "$ecs_address" ]; then
client_subnet='"client_subnet": "'"$ecs_address"'",'
else
logger "自动获取ecs网段失败！" 33
fi
} }
#根据dns模式生成 #根据dns模式生成
[ "$dns_mod" = "redir_host" ] && { [ "$dns_mod" = "redir_host" ] && {