1 files changed, 33 insertions, 1 deletions
diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index c0212c6..14da2e2 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -24,7 +24,7 @@
 :global WaitFullyConnected;
 
 :local FindDelim do={
-  :local ValidChars "0123456789./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
+  :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
   :for I from=0 to=[ :len $1 ] do={
     :if ([ :typeof [ :find $ValidChars [ :pick ($1 . " ") $I ] ] ] != "num") do={
       :return $I;
@@ -42,6 +42,7 @@ $WaitFullyConnected;
   :local CntRenew 0;
   :local CntRemove 0;
   :local IPv4Addresses ({});
+  :local IPv6Addresses ({});
   :local Failure false;
 
   :foreach List in=$FwList do={
@@ -87,6 +88,10 @@ $WaitFullyConnected;
            $Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
         :set ($IPv4Addresses->$Address) $TimeOut;
       }
+      :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$" || \
+           $Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
+        :set ($IPv6Addresses->$Address) $TimeOut;
+      }
       :set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
     }
   }
@@ -107,6 +112,22 @@ $WaitFullyConnected;
     }
   }
 
+  :foreach Entry in=[ /ipv6/firewall/address-list/find where list=$FwListName comment=$ListComment ] do={
+    :local Address [ /ipv6/firewall/address-list/get $Entry address ];
+    :if ([ :typeof ($IPv6Addresses->$Address) ] = "time") do={
+      $LogPrintExit2 debug $0 ("Renewing IPv6 address for " . ($IPv6Addresses->$Address) . ": " . $Address) false;
+      /ipv6/firewall/address-list/set $Entry timeout=($IPv6Addresses->$Address);
+      :set ($IPv6Addresses->$Address);
+      :set CntRenew ($CntRenew + 1);
+    } else={
+      :if ($Failure = false) do={
+        $LogPrintExit2 debug $0 ("Removing: " . $Address) false;
+        /ipv6/firewall/address-list/remove $Entry;
+        :set CntRemove ($CntRemove + 1);
+      }
+    }
+  }
+
   :foreach Address,Timeout in=$IPv4Addresses do={
     $LogPrintExit2 debug $0 ("Adding IPv4 address for " . $Timeout . ": " . $Address) false;
     :do {
@@ -118,5 +139,16 @@ $WaitFullyConnected;
     }
   }
 
+  :foreach Address,Timeout in=$IPv6Addresses do={
+    $LogPrintExit2 debug $0 ("Adding IPv6 address for " . $Timeout . ": " . $Address) false;
+    :do {
+      /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment address=$Address timeout=$Timeout;
+      :set ($IPv6Addresses->$Address);
+      :set CntAdd ($CntAdd + 1);
+    } on-error={
+      $LogPrintExit2 warning $0 ("Failed to add IPv6 address " . $Address . " to list '" . $FwListName . "'.") false;
+    }
+  }
+
   $LogPrintExit2 info $0 ("list: " . $FwListName . " -- added: " . $CntAdd . " - renewed: " . $CntRenew . " - removed: " . $CntRemove) false;
 }