not print null when IPv4 record is empty

phlinhng · Mar 8, 2021 · 2d46b71 · 2d46b71
1 parent 401363e
commit 2d46b71
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/xwall.sh b/src/xwall.sh
@@ -140,7 +140,7 @@ checkIP() {
   local resolvedIP4="$(curl -sSL https://cloudflare-dns.com/dns-query\?name\=$1\&type\=A -H 'accept: application/dns-json' | jq ".Answer[0].data" --raw-output)"
 
   [ ! -z "${realIP4}" ] && printf "%s %s\n" "detected IPv4 address:" "${realIP4}" | writeLog >> $log_path
-  [ ! -z "${resolvedIP4}" ] && printf "%s %s\n" "found A record:" "${resolvedIP4}" | writeLog >> $log_path
+  ([ ! -z "${resolvedIP4}" ] && [ "${resolvedIP4}" != "null" ]) && printf "%s %s\n" "found A record:" "${resolvedIP4}" | writeLog >> $log_path
 
   if [[ "${realIP4}" == "${resolvedIP4}" ]]; then
     echo "A record matched." | writeLog >> $log_path
@@ -149,7 +149,7 @@ checkIP() {
     local realIP6="$(curl -sL ${ip6_api} -m 5)"
     local resolvedIP6="$(curl -sSL https://cloudflare-dns.com/dns-query\?name\=$1\&type\=AAAA -H 'accept: application/dns-json' | jq ".Answer[0].data" --raw-output)"
     [ ! -z "${realIP6}" ] && printf "%s %s\n" "detected IPv6 address:" "${realIP6}" | writeLog >> $log_path
-    [ ! -z "${resolvedIP6}" ] && printf "%s %s\n" "found AAAA record:" "${resolvedIP6}" | writeLog >> $log_path
+    ([ ! -z "${resolvedIP6}" ] && [ "${resolvedIP6}" != "null" ]) && printf "%s %s\n" "found AAAA record:" "${resolvedIP6}" | writeLog >> $log_path
     if [[ "${realIP6}" == "${resolvedIP6}" ]]; then
       echo "AAAA record matched." | writeLog >> $log_path
       return 0