groove/routeros-scripts-main
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2026-03-03 20:49:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fw-addr-lists: normalize the address in list

Browse source
This commit is contained in:
Christian Hesse 2025-10-15 10:47:56 +02:00
parent 6630d35eea
commit 87a6e60765
1 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
fw-addr-lists.rsc
View file

@ -21,11 +21,11 @@
:global CertificateAvailable; :global CertificateAvailable;
:global EitherOr; :global EitherOr;
:global FetchHuge; :global FetchHuge;
:global GetRandom20CharAlNum;
:global HumanReadableNum; :global HumanReadableNum;
:global LogPrint; :global LogPrint;
:global LogPrintOnce; :global LogPrintOnce;
:global LogPrintVerbose; :global LogPrintVerbose;
:global MIN;
:global ScriptLock; :global ScriptLock;
:global WaitFullyConnected; :global WaitFullyConnected;
@ -56,6 +56,23 @@
} }
:local ListComment ("managed by " . $ScriptName); :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;
}
: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") "/" ] ] ];
}
:local Maskv6 ({});
:for I from=0 to=128 do={
/ipv6/firewall/address-list/add dynamic=yes timeout=30s list=$GenList address=("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/" . $I) comment=$I;
}
: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") "/" ] ] ];
}
:foreach FwListName,FwList in=$FwAddrLists do={ :foreach FwListName,FwList in=$FwAddrLists do={
:local CntAdd 0; :local CntAdd 0;
@ -114,8 +131,13 @@
:do { :do {
:local Branch; :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 ~ "^[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={ :local Net $Address;
:set Address [ :pick $Address 0 ([ :len $Address ] - 3) ]; :local Cidr 32;
:local Slash [ :find $Address "/" ];
:if ([ :typeof $Slash ] = "num") do={
:set Net [ :toip [ :pick $Address 0 $Slash ] ]
:set Cidr [ :pick $Address ($Slash + 1) [ :len $Address ] ];
:set Address (([ :toip $Net ] & ($Maskv4->$Cidr)) . "/" . $Cidr);
} }
:set Branch [ $GetBranch $Address ]; :set Branch [ $GetBranch $Address ];
:set ($IPv4Addresses->$Branch->$Address) $TimeOut; :set ($IPv4Addresses->$Branch->$Address) $TimeOut;
@ -123,13 +145,13 @@
} }
:if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
:local Net $Address; :local Net $Address;
:local Cidr 64; :local Cidr 128;
:local Slash [ :find $Address "/" ]; :local Slash [ :find $Address "/" ];
:if ([ :typeof $Slash ] = "num") do={ :if ([ :typeof $Slash ] = "num") do={
:set Net [ :toip6 [ :pick $Address 0 $Slash ] ] :set Net [ :toip6 [ :pick $Address 0 $Slash ] ]
:set Cidr [ $MIN [ :pick $Address ($Slash + 1) [ :len $Address ] ] 64 ]; :set Cidr [ :pick $Address ($Slash + 1) [ :len $Address ] ];
} }
:set Address (([ :toip6 $Net ] & ffff:ffff:ffff:ffff::) . "/" . $Cidr); :set Address (([ :toip6 $Net ] & ($Maskv6->$Cidr)) . "/" . $Cidr);
:set Branch [ $GetBranch $Address ]; :set Branch [ $GetBranch $Address ];
:set ($IPv6Addresses->$Branch->$Address) $TimeOut; :set ($IPv6Addresses->$Branch->$Address) $TimeOut;
:error true; :error true;