mirror of
https://gitlab.com/fscarmen/warp.git
synced 2026-06-15 03:25:42 +08:00
Modify the IP API URL to ip.cloudflare.now.cc
This commit is contained in:
@@ -591,10 +591,10 @@ ip_info() {
|
||||
# 对于查 socks5 代理的 IP,需要用另一个 IP api
|
||||
if grep -q 'socks5' <<< "$INTERFACE_SOCK5"; then
|
||||
local WAN=$(curl -s -A a --retry 2 $INTERFACE_SOCK5 https://api-ipv${CHECK_46}.ip.sb/ip) &&
|
||||
local IP_JSON=$(curl -sm2 --retry 2 https://ip.cloudflare.nyc.mn/${WAN}${IS_CHINESE}) &&
|
||||
local IP_JSON=$(curl -sm2 --retry 2 https://ip.cloudflare.now.cc/${WAN}${IS_CHINESE}) &&
|
||||
grep -qi '"isp".*Cloudflare' <<< "$IP_JSON" && local IP_TRACE='on'
|
||||
else
|
||||
local IP_JSON=$(curl --retry 2 -ksm2 $INTERFACE_SOCK5 -$CHECK_46 https://ip.cloudflare.nyc.mn${IS_CHINESE}) &&
|
||||
local IP_JSON=$(curl --retry 2 -ksm2 $INTERFACE_SOCK5 -$CHECK_46 https://ip.cloudflare.now.cc${IS_CHINESE}) &&
|
||||
local IP_TRACE=$(awk -F '"' '/"warp"/{print $4}' <<< "$IP_JSON") &&
|
||||
local WAN=$(awk -F '"' '/"ip"/{print $4}' <<< "$IP_JSON")
|
||||
fi
|
||||
|
||||
+4
-4
@@ -443,7 +443,7 @@ ip4_info() {
|
||||
IS_UNINSTALL="$1"
|
||||
grep -q 'is_uninstall' <<< "$IS_UNINSTALL" && unset INTERFACE_4
|
||||
[ "$L" = 'C' ] && IS_CHINESE=${IS_CHINESE:-'?lang=zh-CN'}
|
||||
local IP_JSON=$(curl --retry 2 -ks4m2 $INTERFACE_4 http://ip.cloudflare.nyc.mn${IS_CHINESE}) &&
|
||||
local IP_JSON=$(curl --retry 2 -ks4m2 $INTERFACE_4 http://ip.cloudflare.now.cc${IS_CHINESE}) &&
|
||||
TRACE4=$(awk -F '"' '/"warp"/{print $4}' <<< "$IP_JSON") &&
|
||||
WAN4=$(awk -F '"' '/"ip"/{print $4}' <<< "$IP_JSON") &&
|
||||
COUNTRY4=$(awk -F '"' '/"country"/{print $4}' <<< "$IP_JSON") &&
|
||||
@@ -455,7 +455,7 @@ ip6_info() {
|
||||
IS_UNINSTALL="$1"
|
||||
grep -q 'is_uninstall' <<< "$IS_UNINSTALL" && unset INTERFACE_6
|
||||
[ "$L" = 'C' ] && IS_CHINESE=${IS_CHINESE:-'?lang=zh-CN'}
|
||||
local IP_JSON=$(curl --retry 2 -ks6m2 $INTERFACE_6 http://ip.cloudflare.nyc.mn${IS_CHINESE}) &&
|
||||
local IP_JSON=$(curl --retry 2 -ks6m2 $INTERFACE_6 http://ip.cloudflare.now.cc${IS_CHINESE}) &&
|
||||
TRACE6=$(awk -F '"' '/"warp"/{print $4}' <<< "$IP_JSON") &&
|
||||
WAN6=$(awk -F '"' '/"ip"/{print $4}' <<< "$IP_JSON") &&
|
||||
COUNTRY6=$(awk -F '"' '/"country"/{print $4}' <<< "$IP_JSON") &&
|
||||
@@ -508,7 +508,7 @@ result_priority() {
|
||||
PRIO=6
|
||||
;;
|
||||
* )
|
||||
[[ "$(curl -ksm8 http://ip.cloudflare.nyc.mn | awk -F '"' '/"ip"/{print $4}')" =~ ^([0-9]{1,3}\.){3} ]] && PRIO=4 || PRIO=6
|
||||
[[ "$(curl -ksm8 http://ip.cloudflare.now.cc | awk -F '"' '/"ip"/{print $4}')" =~ ^([0-9]{1,3}\.){3} ]] && PRIO=4 || PRIO=6
|
||||
esac
|
||||
PRIORITY_NOW=$(text_eval 21)
|
||||
|
||||
@@ -1173,7 +1173,7 @@ EOF
|
||||
echo "$L" > /opt/warp-go/language
|
||||
|
||||
# 结果提示,脚本运行时间,次数统计,IPv4 / IPv6 优先级别
|
||||
[ "$(curl -ksm8 http://ip.cloudflare.nyc.mn | awk -F '"' '/"ip"/{print $4}')" = "$WAN6" ] && PRIO=6 || PRIO=4
|
||||
[ "$(curl -ksm8 http://ip.cloudflare.now.cc | awk -F '"' '/"ip"/{print $4}')" = "$WAN6" ] && PRIO=6 || PRIO=4
|
||||
end=$(date +%s)
|
||||
ACCOUNT_TYPE=$(grep "Type" /opt/warp-go/warp.conf | cut -d= -f2 | sed "s# ##g")
|
||||
result_priority
|
||||
|
||||
Reference in New Issue
Block a user