aboutsummaryrefslogtreecommitdiffstats
path: root/fw-addr-lists.rsc
diff options
context:
space:
mode:
Diffstat (limited to 'fw-addr-lists.rsc')
-rw-r--r--fw-addr-lists.rsc18
1 files changed, 6 insertions, 12 deletions
diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 68775b4..66f8581 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -3,7 +3,7 @@
# Copyright (c) 2023-2024 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
-# requires RouterOS, version=7.12
+# requires RouterOS, version=7.13
#
# download, import and update firewall address-lists
# https://git.eworm.de/cgit/routeros-scripts/about/doc/fw-addr-lists.md
@@ -19,7 +19,7 @@
:global CertificateAvailable;
:global EitherOr;
- :global FetchUserAgentStr;
+ :global FetchHuge;
:global LogPrint;
:global LogPrintOnce;
:global ScriptLock;
@@ -50,12 +50,12 @@
:local Failure false;
:foreach List in=$FwList do={
- :local CheckCertificate "no";
+ :local CheckCertificate false;
:local Data false;
:local TimeOut [ $EitherOr [ :totime ($List->"timeout") ] $FwAddrListTimeOut ];
:if ([ :len ($List->"cert") ] > 0) do={
- :set CheckCertificate "yes-without-crl";
+ :set CheckCertificate true;
:if ([ $CertificateAvailable ($List->"cert") ] = false) do={
$LogPrint warning $ScriptName ("Downloading required certificate failed, trying anyway.");
}
@@ -63,10 +63,8 @@
:for I from=1 to=5 do={
:if ($Data = false) do={
- :do {
- :set Data ([ /tool/fetch check-certificate=$CheckCertificate output=user \
- http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) ($List->"url") as-value ]->"data");
- } on-error={
+ :set Data [ $FetchHuge $ScriptName ($List->"url") $CheckCertificate ];
+ :if ($Data = false) do={
:if ($I < 5) do={
$LogPrint debug $ScriptName ("Failed downloading, " . $I . ". try: " . $List->"url");
:delay (($I * $I) . "s");
@@ -81,10 +79,6 @@
$LogPrint warning $ScriptName ("Failed downloading list from: " . $List->"url");
}
- :if ([ :len $Data ] > 63000) do={
- $LogPrintOnce warning $ScriptName ("The list is huge and may be truncated: " . $List->"url");
- }
-
:while ([ :len $Data ] != 0) do={
:local Line [ :pick $Data 0 [ :find $Data "\n" ] ];
:local Address ([ :pick $Line 0 [ $FindDelim $Line ] ] . ($List->"cidr"));