fw-addr-lists: try with less regexp matches

1 files changed, 15 insertions, 8 deletions

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 66f8581..7e7ee38 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -82,14 +82,21 @@
       :while ([ :len $Data ] != 0) do={
         :local Line [ :pick $Data 0 [ :find $Data "\n" ] ];
         :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})?\$" || \
-             $Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
-          :set ($IPv4Addresses->$Address) $TimeOut;
-        }
-        :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$" || \
-             $Address ~ "^[\\.a-zA-Z0-9-]+\\.[a-zA-Z]{2,}\$") do={
-          :set ($IPv6Addresses->$Address) $TimeOut;
-        }
+        :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;
+            :error true;
+          }
+          :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
+            :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 ] ];
       }
     }