From db88bc27d8f69dd984574ce3501638183f08bfb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=A5=E6=B5=B7?= Date: Wed, 3 Mar 2021 10:53:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=8C=96=E8=8E=B7=E5=8F=96IP=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + ardnspod | 10 ++++++++++ ddnspod.sh | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b8a78ed..912ea41 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Updating Record for test.rehi.org 2021/3/3 +- 强化获取IP结果检测 - 优化部分判断逻辑 - 优化消息输出 diff --git a/ardnspod b/ardnspod index e30dcd6..f56e7fa 100644 --- a/ardnspod +++ b/ardnspod @@ -49,6 +49,11 @@ arWanIp4() { fi fi + if [ -z "$hostIp" ]; then + echo "arWanIp4 - Can't get ip address" + return 1 + fi + if [ -n "$(echo $hostIp | grep -Ev '^[0-9\.]+$')" ]; then echo "arWanIp4 - Invalid ip address $hostIp" return 1 @@ -75,6 +80,11 @@ arWanIp6() { ;; esac + if [ -z "$hostIp" ]; then + echo "arWanIp6 - Can't get ip address" + return 1 + fi + if [ -n "$(echo $hostIp | grep -Ev '^[0-9a-fA-F:]+$')" ]; then echo "arWanIp6 - Invalid ip address" return 1 diff --git a/ddnspod.sh b/ddnspod.sh index de9376b..38b4d9e 100755 --- a/ddnspod.sh +++ b/ddnspod.sh @@ -10,8 +10,8 @@ arToken="12345,7676f344eaeaea9074c123451234512d" # Place each domain you want to check as follows # you can have multiple arDdnsCheck blocks -# IPv6: -arDdnsCheck "test.org" "subdomain6" 6 - # IPv4: arDdnsCheck "test.org" "subdomain" + +# IPv6: +arDdnsCheck "test.org" "subdomain6" 6