From 08ecabb27ccce3f61fbfee0698d82b67b57d0621 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 15 Oct 2025 10:47:56 +0200 Subject: [PATCH 1/4] fw-addr-lists: normalize the address in list --- fw-addr-lists.rsc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index cd136f95..b653ea0f 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -122,14 +122,8 @@ :error true; } :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ - :local Net $Address; - :local Cidr 64; - :local Slash [ :find $Address "/" ]; - :if ([ :typeof $Slash ] = "num") do={ - :set Net [ :toip6 [ :pick $Address 0 $Slash ] ] - :set Cidr [ $MIN [ :pick $Address ($Slash + 1) [ :len $Address ] ] 64 ]; - } - :set Address (([ :toip6 $Net ] & ffff:ffff:ffff:ffff::) . "/" . $Cidr); + /ipv6/firewall/address-list/add dynamic=yes list=$Address address=$Address timeout=1s; + :set Address [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$Address ] address ]; :set Branch [ $GetBranch $Address ]; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; :error true; From 69f78e06abf18b80c30b9ec577548a762fbe89f1 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 15 Oct 2025 11:00:17 +0200 Subject: [PATCH 2/4] fw-addr-lists: also normalize IPv4 addresses --- fw-addr-lists.rsc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index b653ea0f..bef4616c 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -114,9 +114,8 @@ :do { :local Branch; :if ($Address ~ "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?\$") do={ - :if ($Address ~ "/32\$") do={ - :set Address [ :pick $Address 0 ([ :len $Address ] - 3) ]; - } + /ip/firewall/address-list/add dynamic=yes list=$Address address=$Address timeout=1s; + :set Address [ /ip/firewall/address-list/get [ find where dynamic=yes list=$Address ] address ]; :set Branch [ $GetBranch $Address ]; :set ($IPv4Addresses->$Branch->$Address) $TimeOut; :error true; From 2a63a80791f1ab4481da7c67b70680f34703f3a2 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 15 Oct 2025 11:30:26 +0200 Subject: [PATCH 3/4] fw-addr-lists: masks in array --- fw-addr-lists.rsc | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index bef4616c..8fc4f318 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -56,6 +56,18 @@ } :local ListComment ("managed by " . $ScriptName); + :local Maskv4 ({}); + :for I from=0 to=32 do={ + :local List ("mask-" . $I); + /ip/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("255.255.255.255/" . $I); + :set ($Maskv4->$I) [ /ip/firewall/address-list/get [ find where dynamic=yes list=$List ] address ]; + } + :local Maskv6 ({}); + :for I from=0 to=128 do={ + :local List ("mask-" . $I); + /ipv6/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I); + :set ($Maskv4->$I) [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$List ] address ]; + } :foreach FwListName,FwList in=$FwAddrLists do={ :local CntAdd 0; @@ -114,15 +126,13 @@ :do { :local Branch; :if ($Address ~ "^[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}(/[0-9]{1,2})?\$") do={ - /ip/firewall/address-list/add dynamic=yes list=$Address address=$Address timeout=1s; - :set Address [ /ip/firewall/address-list/get [ find where dynamic=yes list=$Address ] address ]; + :set Address :set Branch [ $GetBranch $Address ]; :set ($IPv4Addresses->$Branch->$Address) $TimeOut; :error true; } :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ - /ipv6/firewall/address-list/add dynamic=yes list=$Address address=$Address timeout=1s; - :set Address [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$Address ] address ]; + :set Address :set Branch [ $GetBranch $Address ]; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; :error true; From 3da600d489980fcb05ff99b9a3955152c385d104 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 15 Oct 2025 11:35:33 +0200 Subject: [PATCH 4/4] fw-addr-lists: calc from mask --- fw-addr-lists.rsc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index 8fc4f318..3a92aede 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -60,13 +60,15 @@ :for I from=0 to=32 do={ :local List ("mask-" . $I); /ip/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("255.255.255.255/" . $I); - :set ($Maskv4->$I) [ /ip/firewall/address-list/get [ find where dynamic=yes list=$List ] address ]; + :local Address [ /ip/firewall/address-list/get [ find where dynamic=yes list=$List ] address ]; + :set ($Maskv4->$I) [ :toip [ :pick $Address 0 [ :find Address "/" ] ] ]; } :local Maskv6 ({}); :for I from=0 to=128 do={ :local List ("mask-" . $I); /ipv6/firewall/address-list/add dynamic=yes timeout=1s list=$List address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I); - :set ($Maskv4->$I) [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$List ] address ]; + :local Address [ /ipv6/firewall/address-list/get [ find where dynamic=yes list=$List ] address ]; + :set ($Maskv4->$I) [ :toip6 [ :pick $Address 0 [ :find Address "/" ] ] ]; } :foreach FwListName,FwList in=$FwAddrLists do={ @@ -132,7 +134,14 @@ :error true; } :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ - :set Address + :local Net $Address; + :local Cidr 64; + :local Slash [ :find $Address "/" ]; + :if ([ :typeof $Slash ] = "num") do={ + :set Net [ :toip6 [ :pick $Address 0 $Slash ] ] + :set Cidr [ $MIN [ :pick $Address ($Slash + 1) [ :len $Address ] ] 64 ]; + } + :set Address (([ :toip6 $Net ] & ($Maskv6->$Cidr)) . "/" . $Cidr); :set Branch [ $GetBranch $Address ]; :set ($IPv6Addresses->$Branch->$Address) $TimeOut; :error true;