fw-addr-lists: move code into function

1 files changed, 117 insertions, 112 deletions

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 14da2e2..d4ac519 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -8,147 +8,152 @@
 # download, import and update firewall address-lists
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/fw-addr-lists.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global FetchUserAgent;
-:global FwAddrLists;
-:global FwAddrListTimeOut;
-
-:global CertificateAvailable;
-:global EitherOr;
-:global LogPrintExit2;
-:global LogPrintOnce;
-:global ScriptLock;
-:global WaitFullyConnected;
-
-:local FindDelim do={
-  :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
-  :for I from=0 to=[ :len $1 ] do={
-    :if ([ :typeof [ :find $ValidChars [ :pick ($1 . " ") $I ] ] ] != "num") do={
-      :return $I;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
+
+  :global FetchUserAgent;
+  :global FwAddrLists;
+  :global FwAddrListTimeOut;
+
+  :global CertificateAvailable;
+  :global EitherOr;
+  :global LogPrintExit2;
+  :global LogPrintOnce;
+  :global ScriptLock;
+  :global WaitFullyConnected;
+
+  :local FindDelim do={
+    :local ValidChars "0123456789.:/ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-";
+    :for I from=0 to=[ :len $1 ] do={
+      :if ([ :typeof [ :find $ValidChars [ :pick ($1 . " ") $I ] ] ] != "num") do={
+        :return $I;
+      }
     }
   }
-}
 
-$ScriptLock $0;
-$WaitFullyConnected;
+  $ScriptLock $ScriptName;
+  $WaitFullyConnected;
 
-:local ListComment ("managed by " . $0);
+  :local ListComment ("managed by " . $ScriptName);
 
-:foreach FwListName,FwList in=$FwAddrLists do={
-  :local CntAdd 0;
-  :local CntRenew 0;
-  :local CntRemove 0;
-  :local IPv4Addresses ({});
-  :local IPv6Addresses ({});
-  :local Failure false;
+  :foreach FwListName,FwList in=$FwAddrLists do={
+    :local CntAdd 0;
+    :local CntRenew 0;
+    :local CntRemove 0;
+    :local IPv4Addresses ({});
+    :local IPv6Addresses ({});
+    :local Failure false;
 
-  :foreach List in=$FwList do={
-    :local CheckCertificate "no";
-    :local Data false;
-    :local TimeOut [ $EitherOr [ :totime ($List->"timeout") ] $FwAddrListTimeOut ];
+    :foreach List in=$FwList do={
+      :local CheckCertificate "no";
+      :local Data false;
+      :local TimeOut [ $EitherOr [ :totime ($List->"timeout") ] $FwAddrListTimeOut ];
 
-    :if ([ :len ($List->"cert") ] > 0) do={
-      :set CheckCertificate "yes-without-crl";
-      :if ([ $CertificateAvailable ($List->"cert") ] = false) do={
-        $LogPrintExit2 warning $0 ("Downloading required certificate failed, trying anyway.") false;
+      :if ([ :len ($List->"cert") ] > 0) do={
+        :set CheckCertificate "yes-without-crl";
+        :if ([ $CertificateAvailable ($List->"cert") ] = false) do={
+          $LogPrintExit2 warning $ScriptName ("Downloading required certificate failed, trying anyway.") false;
+        }
       }
-    }
 
-    :for I from=1 to=4 do={
-      :if ($Data = false) do={
-        :do {
-          :set Data ([ /tool/fetch check-certificate=$CheckCertificate output=user \
-            http-header-field=({ $FetchUserAgent }) ($List->"url") as-value ]->"data");
-        } on-error={
-          :if ($I < 4) do={
-            $LogPrintExit2 debug $0 ("Failed downloading, " . $I . ". try: " . $List->"url") false;
-            :delay (($I * $I) . "s");
+      :for I from=1 to=4 do={
+        :if ($Data = false) do={
+          :do {
+            :set Data ([ /tool/fetch check-certificate=$CheckCertificate output=user \
+              http-header-field=({ $FetchUserAgent }) ($List->"url") as-value ]->"data");
+          } on-error={
+            :if ($I < 4) do={
+              $LogPrintExit2 debug $ScriptName ("Failed downloading, " . $I . ". try: " . $List->"url") false;
+              :delay (($I * $I) . "s");
+            }
           }
         }
       }
-    }
 
-    :if ($Data = false) do={
-      :set Data "";
-      :set Failure true;
-      $LogPrintExit2 warning $0 ("Failed downloading list from: " . $List->"url") false;
-    }
-
-    :if ([ :len $Data ] > 63000) do={
-      $LogPrintOnce warning $0 ("The list is huge and may be truncated: " . $List->"url") false;
-    }
+      :if ($Data = false) do={
+        :set Data "";
+        :set Failure true;
+        $LogPrintExit2 warning $ScriptName ("Failed downloading list from: " . $List->"url") false;
+      }
 
-    :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 ([ :len $Data ] > 63000) do={
+        $LogPrintOnce warning $ScriptName ("The list is huge and may be truncated: " . $List->"url") false;
       }
-      :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;
+
+      :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;
+        }
+        :set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
       }
-      :set Data [ :pick $Data ([ :len $Line ] + 1) [ :len $Data ] ];
     }
-  }
 
-  :foreach Entry in=[ /ip/firewall/address-list/find where list=$FwListName comment=$ListComment ] do={
-    :local Address [ /ip/firewall/address-list/get $Entry address ];
-    :if ([ :typeof ($IPv4Addresses->$Address) ] = "time") do={
-      $LogPrintExit2 debug $0 ("Renewing IPv4 address for " . ($IPv4Addresses->$Address) . ": " . $Address) false;
-      /ip/firewall/address-list/set $Entry timeout=($IPv4Addresses->$Address);
-      :set ($IPv4Addresses->$Address);
-      :set CntRenew ($CntRenew + 1);
-    } else={
-      :if ($Failure = false) do={
-        $LogPrintExit2 debug $0 ("Removing IPv4 address: " . $Address) false;
-        /ip/firewall/address-list/remove $Entry;
-        :set CntRemove ($CntRemove + 1);
+    :foreach Entry in=[ /ip/firewall/address-list/find where list=$FwListName comment=$ListComment ] do={
+      :local Address [ /ip/firewall/address-list/get $Entry address ];
+      :if ([ :typeof ($IPv4Addresses->$Address) ] = "time") do={
+        $LogPrintExit2 debug $ScriptName ("Renewing IPv4 address for " . ($IPv4Addresses->$Address) . ": " . $Address) false;
+        /ip/firewall/address-list/set $Entry timeout=($IPv4Addresses->$Address);
+        :set ($IPv4Addresses->$Address);
+        :set CntRenew ($CntRenew + 1);
+      } else={
+        :if ($Failure = false) do={
+          $LogPrintExit2 debug $ScriptName ("Removing IPv4 address: " . $Address) false;
+          /ip/firewall/address-list/remove $Entry;
+          :set CntRemove ($CntRemove + 1);
+        }
       }
     }
-  }
 
-  :foreach Entry in=[ /ipv6/firewall/address-list/find where list=$FwListName comment=$ListComment ] do={
-    :local Address [ /ipv6/firewall/address-list/get $Entry address ];
-    :if ([ :typeof ($IPv6Addresses->$Address) ] = "time") do={
-      $LogPrintExit2 debug $0 ("Renewing IPv6 address for " . ($IPv6Addresses->$Address) . ": " . $Address) false;
-      /ipv6/firewall/address-list/set $Entry timeout=($IPv6Addresses->$Address);
-      :set ($IPv6Addresses->$Address);
-      :set CntRenew ($CntRenew + 1);
-    } else={
-      :if ($Failure = false) do={
-        $LogPrintExit2 debug $0 ("Removing: " . $Address) false;
-        /ipv6/firewall/address-list/remove $Entry;
-        :set CntRemove ($CntRemove + 1);
+    :foreach Entry in=[ /ipv6/firewall/address-list/find where list=$FwListName comment=$ListComment ] do={
+      :local Address [ /ipv6/firewall/address-list/get $Entry address ];
+      :if ([ :typeof ($IPv6Addresses->$Address) ] = "time") do={
+        $LogPrintExit2 debug $ScriptName ("Renewing IPv6 address for " . ($IPv6Addresses->$Address) . ": " . $Address) false;
+        /ipv6/firewall/address-list/set $Entry timeout=($IPv6Addresses->$Address);
+        :set ($IPv6Addresses->$Address);
+        :set CntRenew ($CntRenew + 1);
+      } else={
+        :if ($Failure = false) do={
+          $LogPrintExit2 debug $ScriptName ("Removing: " . $Address) false;
+          /ipv6/firewall/address-list/remove $Entry;
+          :set CntRemove ($CntRemove + 1);
+        }
       }
     }
-  }
 
-  :foreach Address,Timeout in=$IPv4Addresses do={
-    $LogPrintExit2 debug $0 ("Adding IPv4 address for " . $Timeout . ": " . $Address) false;
-    :do {
-      /ip/firewall/address-list/add list=$FwListName comment=$ListComment address=$Address timeout=$Timeout;
-      :set ($IPv4Addresses->$Address);
-      :set CntAdd ($CntAdd + 1);
-    } on-error={
-      $LogPrintExit2 warning $0 ("Failed to add IPv4 address " . $Address . " to list '" . $FwListName . "'.") false;
+    :foreach Address,Timeout in=$IPv4Addresses do={
+      $LogPrintExit2 debug $ScriptName ("Adding IPv4 address for " . $Timeout . ": " . $Address) false;
+      :do {
+        /ip/firewall/address-list/add list=$FwListName comment=$ListComment address=$Address timeout=$Timeout;
+        :set ($IPv4Addresses->$Address);
+        :set CntAdd ($CntAdd + 1);
+      } on-error={
+        $LogPrintExit2 warning $ScriptName ("Failed to add IPv4 address " . $Address . " to list '" . $FwListName . "'.") false;
+      }
     }
-  }
 
-  :foreach Address,Timeout in=$IPv6Addresses do={
-    $LogPrintExit2 debug $0 ("Adding IPv6 address for " . $Timeout . ": " . $Address) false;
-    :do {
-      /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment address=$Address timeout=$Timeout;
-      :set ($IPv6Addresses->$Address);
-      :set CntAdd ($CntAdd + 1);
-    } on-error={
-      $LogPrintExit2 warning $0 ("Failed to add IPv6 address " . $Address . " to list '" . $FwListName . "'.") false;
+    :foreach Address,Timeout in=$IPv6Addresses do={
+      $LogPrintExit2 debug $ScriptName ("Adding IPv6 address for " . $Timeout . ": " . $Address) false;
+      :do {
+        /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment address=$Address timeout=$Timeout;
+        :set ($IPv6Addresses->$Address);
+        :set CntAdd ($CntAdd + 1);
+      } on-error={
+        $LogPrintExit2 warning $ScriptName ("Failed to add IPv6 address " . $Address . " to list '" . $FwListName . "'.") false;
+      }
     }
-  }
 
-  $LogPrintExit2 info $0 ("list: " . $FwListName . " -- added: " . $CntAdd . " - renewed: " . $CntRenew . " - removed: " . $CntRemove) false;
+    $LogPrintExit2 info $ScriptName ("list: " . $FwListName . " -- added: " . $CntAdd . " - renewed: " . $CntRenew . " - removed: " . $CntRemove) false;
+  }
 }
+
+$Main [ :jobname ];