From 8fb399ad688d7c3fb6206e8681d6732d514bd601 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Sun, 31 Jan 2021 13:25:15 -0500 Subject: [PATCH] Fixing valid_ipv6 function to better detect all potential cases of ipv6 --- src/dynamic-ip | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dynamic-ip b/src/dynamic-ip index 32f31aa..651ae72 100755 --- a/src/dynamic-ip +++ b/src/dynamic-ip @@ -37,8 +37,11 @@ valid_ipv4() { valid_ipv6() { local ip=$1 + local regex='^([[:xdigit:]]{0,4}:){1,7}[[:xdigit:]]{0,4}$' + #local regex='^$|^[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}$' - if [[ $ip =~ ^$|^[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}$ ]]; then + #if [[ $ip =~ ^$|^[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}:[0-9a-fA-F]{1,4}$ ]]; then + if [[ $ip =~ $regex ]]; then return 0 else return 1