Merge branch 'ipv6-update'

1 files changed, 21 insertions, 4 deletions

diff --git a/ipv6-update b/ipv6-update
index 4fdda3d..2224a11 100644
--- a/ipv6-update
+++ b/ipv6-update
@@ -17,15 +17,32 @@
 
 :local Pool [ / ipv6 pool get [ find where prefix=$PdPrefix ] name ];
 :local AddrList [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ];
+:if ([ :len $AddrList ] = 0) do={
+  :log info ("Missing ipv6 address list entry for ipv6-pool-" . $Pool . ", adding.");
+  / ipv6 firewall address-list add list=("ipv6-pool-" . $Pool) address=:: comment=("ipv6-pool-" . $Pool);
+  :set AddrList [ / ipv6 firewall address-list find where comment=("ipv6-pool-" . $Pool) ];
+}
 :local OldPrefix [ / ipv6 firewall address-list get $AddrList address ];
 
-# give the interfaces a moment to receive their addresses
-:delay 2s;
-
-if ($OldPrefix != $PdPrefix) do={
+:if ($OldPrefix != $PdPrefix) do={
   :log info ("Updating IPv6 address list with new IPv6 prefix " . $PdPrefix);
   / ipv6 firewall address-list set address=$PdPrefix $AddrList;
 
+  # give the interfaces a moment to receive their addresses
+  :delay 2s;
+
+  :foreach ListEntry in=[ / ipv6 firewall address-list find where comment~("^ipv6-pool-" . $Pool . ",") ] do={
+    :local ListEntryVal [ / ipv6 firewall address-list get $ListEntry ];
+    :local Comment [ $ParseKeyValueStore ($ListEntryVal->"comment") ];
+
+    :local Address [ / ipv6 address find where from-pool=$Pool interface=($Comment->"interface") ];
+    :if ([ :len $Address ] = 1) do={
+      :set Address [ / ipv6 address get $Address address ];
+      :log info ("Updating IPv6 address list with new IPv6 prefix " . $Address . " from interface " . ($Comment->"interface"));
+      / ipv6 firewall address-list set address=$Address $ListEntry;
+    }
+  }
+
   :foreach Record in=[ / ip dns static find where comment~("^ipv6-pool-" . $Pool . ",") ] do={
     :local RecordVal [ / ip dns static get $Record ];
     :local Comment [ $ParseKeyValueStore ($RecordVal->"comment") ];