From 0125f102b4f420ed86e9eb968d088576e1fb4c3e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 23 Feb 2024 11:15:46 +0100
Subject: fw-addr-lists: rename variable

---
 fw-addr-lists.rsc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'fw-addr-lists.rsc')

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 7ab575c..c0212c6 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -38,10 +38,10 @@ $WaitFullyConnected;
 :local ListComment ("managed by " . $0);
 
 :foreach FwListName,FwList in=$FwAddrLists do={
-  :local Addresses ({});
   :local CntAdd 0;
   :local CntRenew 0;
   :local CntRemove 0;
+  :local IPv4Addresses ({});
   :local Failure false;
 
   :foreach List in=$FwList do={
@@ -85,7 +85,7 @@ $WaitFullyConnected;
       :local Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr"));
       :if ($Address ~ "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?\$" || \
            $Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
-        :set ($Addresses->$Address) $TimeOut;
+        :set ($IPv4Addresses->$Address) $TimeOut;
       }
       :set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
     }
@@ -93,28 +93,28 @@ $WaitFullyConnected;
 
   :foreach Entry in=[ /ip/firewall/address-list/find where list=$FwListName comment=$ListComment ] do={
     :local Address [ /ip/firewall/address-list/get $Entry address ];
-    :if ([ :typeof ($Addresses->$Address) ] = "time") do={
-      $LogPrintExit2 debug $0 ("Renewing address for " . ($Addresses->$Address) . ": " . $Address) false;
-      /ip/firewall/address-list/set $Entry timeout=($Addresses->$Address);
-      :set ($Addresses->$Address);
+    :if ([ :typeof ($IPv4Addresses->$Address) ] = "time") do={
+      $LogPrintExit2 debug $0 ("Renewing IPv4 address for " . ($IPv4Addresses->$Address) . ": " . $Address) false;
+      /ip/firewall/address-list/set $Entry timeout=($IPv4Addresses->$Address);
+      :set ($IPv4Addresses->$Address);
       :set CntRenew ($CntRenew + 1);
     } else={
       :if ($Failure = false) do={
-        $LogPrintExit2 debug $0 ("Removing address: " . $Address) false;
+        $LogPrintExit2 debug $0 ("Removing IPv4 address: " . $Address) false;
         /ip/firewall/address-list/remove $Entry;
         :set CntRemove ($CntRemove + 1);
       }
     }
   }
 
-  :foreach Address,Timeout in=$Addresses do={
-    $LogPrintExit2 debug $0 ("Adding address for " . $Timeout . ": " . $Address) false;
+  :foreach Address,Timeout in=$IPv4Addresses do={
+    $LogPrintExit2 debug $0 ("Adding IPv4 address for " . $Timeout . ": " . $Address) false;
     :do {
       /ip/firewall/address-list/add list=$FwListName comment=$ListComment address=$Address timeout=$Timeout;
-      :set ($Addresses->$Address);
+      :set ($IPv4Addresses->$Address);
       :set CntAdd ($CntAdd + 1);
     } on-error={
-      $LogPrintExit2 warning $0 ("Failed to add address " . $Address . " to list '" . $FwListName . "'.") false;
+      $LogPrintExit2 warning $0 ("Failed to add IPv4 address " . $Address . " to list '" . $FwListName . "'.") false;
     }
   }
 
-- 
cgit v1.2.3-54-g00ecf