ddns-scripts: fix comparing IPv6 addresses 2468/head
authorChristian Schoenebeck <christian.schoenebeck@gmail.com>
Mon, 7 Mar 2016 11:04:50 +0000 (12:04 +0100)
committerChristian Schoenebeck <christian.schoenebeck@gmail.com>
Mon, 7 Mar 2016 11:04:50 +0000 (12:04 +0100)
fix comparing IPv6 addresses

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
net/ddns-scripts/Makefile
net/ddns-scripts/files/dynamic_dns_functions.sh
net/ddns-scripts/files/dynamic_dns_updater.sh

index 7671ffcd5ea55a06d1eba8eff81865f7c59f5880..1805450f96fa1abacea16eb849f7c705edce148f 100755 (executable)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ddns-scripts
 # Version == major.minor.patch
 # increase on new functionality (minor) or patches (patch)
-PKG_VERSION:=2.6.3
+PKG_VERSION:=2.6.4
 # Release == build
 # increase on changes of services files or tld_names.dat
 PKG_RELEASE:=1
index 1f98f7520c22e92ee6e1965882257879bad7af91..525719b59328e9157711d6ede207a4fef4553a69 100755 (executable)
@@ -21,7 +21,7 @@
 . /lib/functions/network.sh
 
 # GLOBAL VARIABLES #
-VERSION="2.6.3-1"
+VERSION="2.6.4-1"
 SECTION_ID=""          # hold config's section name
 VERBOSE_MODE=1         # default mode is log to console, but easily changed with parameter
 
index 78b3df74d9b837d22daa446fc40fa08512b66fc5..02a61dfe90205a900c9bddb6050337c19aaff1be 100755 (executable)
@@ -265,18 +265,15 @@ get_registered_ip REGISTERED_IP "NO_RETRY"
 ERR_LAST=$?
 #     No error    or     No IP set      otherwise retry
 [ $ERR_LAST -eq 0 -o $ERR_LAST -eq 127 ] || get_registered_ip REGISTERED_IP
+# on IPv6 we use expanded version to be shure when comparing
+[ $use_ipv6 -eq 1 ] && expand_ipv6 "$REGISTERED_IP" REGISTERED_IP
 
 # loop endlessly, checking ip every check_interval and forcing an updating once every force_interval
 write_log 6 "Starting main loop at $(eval $DATE_PROG)"
 while : ; do
 
        get_local_ip LOCAL_IP           # read local IP
-
-       # on IPv6 we use expanded version to be shure when comparing
-       [ $use_ipv6 -eq 1 ] && {
-               expand_ipv6 "$LOCAL_IP" LOCAL_IP
-               expand_ipv6 "$REGISTERED_IP" REGISTERED_IP
-       }
+       [ $use_ipv6 -eq 1 ] && expand_ipv6 "$LOCAL_IP" LOCAL_IP # on IPv6 we use expanded version
 
        # prepare update
        # never updated or forced immediate then NEXT_TIME = 0
@@ -332,6 +329,7 @@ while : ; do
 
        REGISTERED_IP=""                # clear variable
        get_registered_ip REGISTERED_IP # get registered/public IP
+       [ $use_ipv6 -eq 1 ] && expand_ipv6 "$REGISTERED_IP" REGISTERED_IP       # on IPv6 we use expanded version
 
        # IP's are still different
        if [ "$LOCAL_IP" != "$REGISTERED_IP" ]; then