From d2f7a6dcef5cce30b1a93c8736f564a11ffd0148 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 15 Oct 2025 19:42:05 +0200 Subject: [PATCH] FIXUP --- fw-addr-lists.rsc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index c93d36ea..5e0aaf3b 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -59,20 +59,19 @@ :local ListComment ("managed by " . $ScriptName); :local GenList ($ScriptName . "-" . [ $GetRandom20CharAlNum ]); - :local Maskv4 ({}); :for I from=0 to=31 do={ /ip/firewall/address-list/add dynamic=yes timeout=30s list=$GenList address=("255.255.255.255/" . $I) comment=$I; } + :local Maskv4 ({ "32"=255.255.255.255; }); :foreach AddressList in=[ /ip/firewall/address-list/find where list=$GenList ] do={ :local Address [ /ip/firewall/address-list/get $AddressList ]; :set ($Maskv4->($Address->"comment")) [ :toip [ :pick ($Address->"address") 0 [ :find ($Address->"address") "/" ] ] ]; } - :set ($Maskv4->"32") 255.255.255.255; - :local Maskv6 ({}); - :for I from=0 to=128 do={ + :for I from=0 to=127 do={ /ipv6/firewall/address-list/add dynamic=yes timeout=30s list=$GenList address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I) comment=$I; } + :local Maskv6 ({ "128"=ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff; }); :foreach AddressList in=[ /ipv6/firewall/address-list/find where list=$GenList ] do={ :local Address [ /ipv6/firewall/address-list/get $AddressList ]; :set ($Maskv6->($Address->"comment")) [ :toip6 [ :pick ($Address->"address") 0 [ :find ($Address->"address") "/" ] ] ]; @@ -155,6 +154,8 @@ :set Net [ :toip6 [ :pick $Address 0 $Slash ] ] :set Cidr [ :pick $Address ($Slash + 1) [ :len $Address ] ]; } + :put ("Net: " . $Net); + :put ("Mask: " . ($Maskv6->$Cidr)); :set Address (([ :toip6 $Net ] & ($Maskv6->$Cidr)) . "/" . $Cidr); :set Branch [ $GetBranch $Address ]; :set ($IPv6Addresses->$Branch->$Address) $TimeOut;