mack-a
/
v2ray-agent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(脚本): 修复双栈vps搭建只使用IPv6无法搭建的问题

master
mack-a 2023-06-06 13:56:04 +08:00
parent 7d672025ec
commit 10b6ce759d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install.sh
View File

@ -478,10 +478,14 @@ allowPort() {
} }
# 获取公网IP # 获取公网IP
getPublicIP() { getPublicIP() {
local type=4
if [[ -n "$1" ]]; then
type=$1
fi
local currentIP= local currentIP=
currentIP=$(curl -s -4 http://www.cloudflare.com/cdn-cgi/trace | grep "ip" | awk -F "[=]" '{print $2}') currentIP=$(curl -s "-${type}" http://www.cloudflare.com/cdn-cgi/trace | grep "ip" | awk -F "[=]" '{print $2}')
if [[ -z "${currentIP}" ]]; then if [[ -z "${currentIP}" ]]; then
currentIP=$(curl -s -6 http://www.cloudflare.com/cdn-cgi/trace | grep "ip" | awk -F "[=]" '{print $2}') currentIP=$(curl -s "-${type}" http://www.cloudflare.com/cdn-cgi/trace | grep "ip" | awk -F "[=]" '{print $2}')
fi fi
echo "${currentIP}" echo "${currentIP}"
} }
@ -991,12 +995,14 @@ installWarp() {
checkDNSIP() { checkDNSIP() {
local domain=$1 local domain=$1
local dnsIP= local dnsIP=
local type=4
dnsIP=$(dig @1.1.1.1 +time=1 +short "${domain}") dnsIP=$(dig @1.1.1.1 +time=1 +short "${domain}")
if echo "${dnsIP}" | grep -q "timed out" || [[ -z "${dnsIP}" ]]; then if echo "${dnsIP}" | grep -q "timed out" || [[ -z "${dnsIP}" ]]; then
echo echo
echoContent red " ---> 无法通过DNS获取域名IPv4地址" echoContent red " ---> 无法通过DNS获取域名IPv4地址"
echoContent green " ---> 尝试检查域名IPv6地址" echoContent green " ---> 尝试检查域名IPv6地址"
dnsIP=$(dig @2606:4700:4700::1111 +time=1 aaaa +short "${domain}") dnsIP=$(dig @2606:4700:4700::1111 +time=1 aaaa +short "${domain}")
type=6
if [[ -z "${dnsIP}" ]]; then if [[ -z "${dnsIP}" ]]; then
echoContent red " ---> 无法通过DNS获取域名IPv6地址，退出安装" echoContent red " ---> 无法通过DNS获取域名IPv6地址，退出安装"
exit 0 exit 0
@ -1004,7 +1010,7 @@ checkDNSIP() {
fi fi
local publicIP= local publicIP=
publicIP=$(getPublicIP) publicIP=$(getPublicIP "${type}")
if [[ "${publicIP}" != "${dnsIP}" ]]; then if [[ "${publicIP}" != "${dnsIP}" ]]; then
echoContent red " ---> 域名解析IP与当前服务器IP不一致\n" echoContent red " ---> 域名解析IP与当前服务器IP不一致\n"
@ -7389,7 +7395,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者：mack-a" echoContent green "作者：mack-a"
echoContent green "当前版本：v2.9.10" echoContent green "当前版本：v2.9.11"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：八合一共存脚本\c" echoContent green "描述：八合一共存脚本\c"
showInstallStatus showInstallStatus