mirror of
https://github.com/eworm-de/routeros-scripts
synced 2024-05-14 08:04:19 +00:00
fw-addr-lists: try with less regexp matches
This commit is contained in:
parent
c3809f240d
commit
4b6d0c02f1
|
@ -82,14 +82,21 @@
|
||||||
: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 {
|
||||||
$Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{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={
|
||||||
:set ($IPv4Addresses->$Address) $TimeOut;
|
:set ($IPv4Addresses->$Address) $TimeOut;
|
||||||
}
|
:error true;
|
||||||
:if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$" || \
|
}
|
||||||
$Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
|
:if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
|
||||||
:set ($IPv6Addresses->$Address) $TimeOut;
|
:set ($IPv6Addresses->$Address) $TimeOut;
|
||||||
}
|
:error true;
|
||||||
|
}
|
||||||
|
:if ($Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
|
||||||
|
:set ($IPv4Addresses->$Address) $TimeOut;
|
||||||
|
:set ($IPv6Addresses->$Address) $TimeOut;
|
||||||
|
:error true;
|
||||||
|
}
|
||||||
|
} on-error={ }
|
||||||
:set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
|
:set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue