mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-26 05:44:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fw-addr-lists: support domain names in lists

Browse source
This commit is contained in:
Christian Hesse 2023-06-12 09:14:36 +02:00
parent 458fe7c088
commit 94b07600ba
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fw-addr-lists.rsc
View file

@ -19,7 +19,7 @@
:global WaitFullyConnected; :global WaitFullyConnected;
:local FindDelim do={ :local FindDelim do={
:local ValidChars "0123456789./"; :local ValidChars "0123456789./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
:for I from=0 to=[ :len $1 ] do={ :for I from=0 to=[ :len $1 ] do={
:if ([ :typeof [ :find $ValidChars [ :pick ($1 . " ") $I ] ] ] != "num") do={ :if ([ :typeof [ :find $ValidChars [ :pick ($1 . " ") $I ] ] ] != "num") do={
:return $I; :return $I;
@ -28,7 +28,6 @@
} }
$ScriptLock $0; $ScriptLock $0;
$WaitFullyConnected; $WaitFullyConnected;
:local ListComment ("managed by " . $0); :local ListComment ("managed by " . $0);
@ -61,7 +60,8 @@ $WaitFullyConnected;
:while ([ :len $Data ] != 0) do={ :while ([ :len $Data ] != 0) do={
:local Line [ :pick $Data 0 [ :find $Data "\n" ] ]; :local Line [ :pick $Data 0 [ :find $Data "\n" ] ];
:local Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr")); :local Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr"));
: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})?\$" || \
$Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
:set ($Addresses->$Address) 1; :set ($Addresses->$Address) 1;
} }
:set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ]; :set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];