diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index 5e0aaf3b..c0061e06 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -135,7 +135,7 @@ :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={ :local Net $Address; - :local Cidr 32; + :local Cidr "32"; :local Slash [ :find $Address "/" ]; :if ([ :typeof $Slash ] = "num") do={ :set Net [ :toip [ :pick $Address 0 $Slash ] ] @@ -148,14 +148,12 @@ } :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={ :local Net $Address; - :local Cidr 128; + :local Cidr "128"; :local Slash [ :find $Address "/" ]; :if ([ :typeof $Slash ] = "num") do={ :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;