mirror of
https://github.com/eworm-de/routeros-scripts.git
synced 2026-03-03 12:39:35 +00:00
fw-addr-lists: calc from mask
This commit is contained in:
parent
2a63a80791
commit
3da600d489
1 changed files with 12 additions and 3 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue