From cc3601dbef2aac25494f2ba20952d6558262d3c6 Mon Sep 17 00:00:00 2001 From: fscarmen <62703343+fscarmen@users.noreply.github.com> Date: Tue, 23 Aug 2022 14:07:48 +0800 Subject: [PATCH] Update menu.sh --- menu.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/menu.sh b/menu.sh index b1f6004..f46e997 100644 --- a/menu.sh +++ b/menu.sh @@ -875,7 +875,7 @@ check_stack(){ # 判断用于检测 NAT VSP,以选择正确配置文件 if [ "$m" -le 3 ]; then NAT=("0@1" "0@1" "1@1") - for ((n=0;n<${#NAT[@]};n++)); do [ "$IPV4@$IPV6" = "${NAT[n]}" ] && break; done + for ((n=0;n<${#NAT[@]};n++)); do [ "$INET4@$INET6" = "${NAT[n]}" ] && break; done CONF1=("014" "104" "114") CONF2=("016" "106" "116") CONF3=("01D" "10D" "11D") @@ -939,8 +939,14 @@ EOF # 判断机器原生状态类型 LAN4=$(ip route get 192.168.193.10 2>/dev/null | grep -oP 'src \K\S+') LAN6=$(ip route get 2606:4700:d0::a29f:c001 2>/dev/null | grep -oP 'src \K\S+') - [ -n "$LAN6" ] && IPV6=1 && ping6 -c2 -w10 2606:4700:d0::a29f:c001 >/dev/null 2>&1 && CDN=-6 && ip6_info || IPV6=0 - [ -n "$LAN4" ] && IPV4=1 && ping -c2 -W3 162.159.193.10 >/dev/null 2>&1 && CDN=-4 && ip4_info || IPV4=0 + if [[ "$LAN6" =~ ^[0-9a-z:]+$ ]]; then + INET6=1 && ping6 -c2 -w10 2606:4700:d0::a29f:c001 >/dev/null 2>&1 && IPV6= 1 && CDN=-6 && ip6_info + else IPV6=0 + fi + if [[ "$LAN4" =~ ^[0-9.]+$ ]]; then + INET4=1 && ping -c2 -W3 162.159.193.10 >/dev/null 2>&1 && IPV4=1 && CDN=-4 && ip4_info + else IPV4=0 + fi [[ $L = C && -n "$COUNTRY4" ]] && COUNTRY4=$(translate "$COUNTRY4") [[ $L = C && -n "$COUNTRY6" ]] && COUNTRY6=$(translate "$COUNTRY6") @@ -1359,6 +1365,9 @@ install(){ sh -c "$(eval echo "\$MODIFY$CONF")" + # NAT VPS 修改 Endpoint + [ $T4@T6@$INET4@$INET6 = @1@1@1 ] && sed -i "s/Endpoint.*/Endpoint = [2606:4700:d0::a29f:c001]:2408/" wgcf-profile.conf + if [[ $OCTEEP = 1 ]]; then # 默认 Endpoint 和 DNS 默认 IPv4 和 双栈的,如是 IPv6 修改默认值 ENDPOINT='162.159.193.10' && DNS='1.1.1.1,8.8.8.8,8.8.4.4,2606:4700:4700::1111,2001:4860:4860::8888,2001:4860:4860::8844'