groove/routeros-scripts-main
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2026-01-22 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fw-addr-lists: fix indention

Browse source
This commit is contained in:
Christian Hesse 2026-01-19 15:38:50 +01:00
parent 971c774a67
commit 57930b09fd
1 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

62
fw-addr-lists.rsc
View file

@ -112,39 +112,39 @@
:set Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr")); :set Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr"));
} }
: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={
:local Net $Address; :local Net $Address;
:local CIDR 32; :local CIDR 32;
:local Slash [ :find $Address "/" ]; :local Slash [ :find $Address "/" ];
:if ([ :typeof $Slash ] = "num") do={ :if ([ :typeof $Slash ] = "num") do={
:set Net [ :toip [ :pick $Address 0 $Slash ] ] :set Net [ :toip [ :pick $Address 0 $Slash ] ]
:set CIDR [ :pick $Address ($Slash + 1) [ :len $Address ] ]; :set CIDR [ :pick $Address ($Slash + 1) [ :len $Address ] ];
:set Address [ :tostr (([ :toip $Net ] & [ $NetMask4 $CIDR ]) . [ $IfThenElse ($CIDR < 32) ("/" . $CIDR) ]) ]; :set Address [ :tostr (([ :toip $Net ] & [ $NetMask4 $CIDR ]) . [ $IfThenElse ($CIDR < 32) ("/" . $CIDR) ]) ];
}
:set Branch [ $GetBranch $Address ];
:set ($IPv4Addresses->$Branch->$Address) $TimeOut;
:continue;
} }
:if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ :set Branch [ $GetBranch $Address ];
:local Net $Address; :set ($IPv4Addresses->$Branch->$Address) $TimeOut;
:local CIDR 128; :continue;
:local Slash [ :find $Address "/" ]; }
:if ([ :typeof $Slash ] = "num") do={ :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
:set Net [ :toip6 [ :pick $Address 0 $Slash ] ] :local Net $Address;
:set CIDR [ :pick $Address ($Slash + 1) [ :len $Address ] ]; :local CIDR 128;
} :local Slash [ :find $Address "/" ];
:set Address (([ :toip6 $Net ] & [ $NetMask6 $CIDR ]) . "/" . $CIDR); :if ([ :typeof $Slash ] = "num") do={
:set Branch [ $GetBranch $Address ]; :set Net [ :toip6 [ :pick $Address 0 $Slash ] ]
:set ($IPv6Addresses->$Branch->$Address) $TimeOut; :set CIDR [ :pick $Address ($Slash + 1) [ :len $Address ] ];
:continue;
}
:if ($Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
:set Branch [ $GetBranch $Address ];
:set ($IPv4Addresses->$Branch->$Address) $TimeOut;
:set ($IPv6Addresses->$Branch->$Address) $TimeOut;
:continue;
} }
:set Address (([ :toip6 $Net ] & [ $NetMask6 $CIDR ]) . "/" . $CIDR);
:set Branch [ $GetBranch $Address ];
:set ($IPv6Addresses->$Branch->$Address) $TimeOut;
:continue;
}
:if ($Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
:set Branch [ $GetBranch $Address ];
:set ($IPv4Addresses->$Branch->$Address) $TimeOut;
:set ($IPv6Addresses->$Branch->$Address) $TimeOut;
:continue;
}
} }
} }