1 files changed, 52 insertions, 37 deletions

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 60cb003..45afa6f 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -1,59 +1,74 @@
 #!rsc by RouterOS
 # RouterOS script: update-tunnelbroker
-# Copyright (c) 2013-2023 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
 #                         Michael Gisbers <michael@gisbers.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# https://rsc.eworm.de/COPYING.md
 #
 # provides: ppp-on-up
+# requires RouterOS, version=7.15
+# requires device-mode, fetch
 #
 # update local address of tunnelbroker interface
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/update-tunnelbroker.md
+# https://rsc.eworm.de/doc/update-tunnelbroker.md
 
-:local 0 "update-tunnelbroker";
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global CertificateAvailable;
-:global LogPrintExit2;
-:global ParseKeyValueStore;
-:global ScriptLock;
+:local ExitOK false;
+:do {
+  :local ScriptName [ :jobname ];
 
-$ScriptLock $0;
+  :global CertificateAvailable;
+  :global LogPrint;
+  :global ParseKeyValueStore;
+  :global ScriptLock;
 
-:if ([ $CertificateAvailable "Starfield Secure Certificate Authority - G2" ] = false) do={
-  $LogPrintExit2 error $0 ("Downloading required certificate failed.") true;
-}
-
-:foreach Interface in=[ /interface/6to4/find where comment~"^tunnelbroker" !disabled ] do={
-  :local Data false;
-  :local InterfaceVal [ /interface/6to4/get $Interface ];
-  :local Comment [ $ParseKeyValueStore ($InterfaceVal->"comment") ];
-
-  :for I from=2 to=0 do={
-    :if ($Data = false) do={
-      :do {
-        :set Data ([ /tool/fetch check-certificate=yes-without-crl \
-          ("https://ipv4.tunnelbroker.net/nic/update?hostname=" . $Comment->"id") \
-          user=($Comment->"user") password=($Comment->"pass") output=user as-value ]->"data");
-      } on-error={
-        $LogPrintExit2 debug $0 ("Failed downloading, " . $I . " retries pending.") false;
-        :delay 2s;
-      }
-    }
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
+    :error false;
   }
 
-  :if (!($Data ~ "^(good|nochg) ")) do={
-    $LogPrintExit2 error $0 ("Failed sending the local address to tunnelbroker or unexpected response!") true;
+  :if ([ $CertificateAvailable "Starfield Root Certificate Authority - G2" ] = false) do={
+    $LogPrint error $ScriptName ("Downloading required certificate failed.");
+    :set ExitOK true;
+    :error false;
   }
 
-  :local PublicAddress [ :pick $Data ([ :find $Data " " ] + 1) [ :find $Data "\n" ] ];
+  :foreach Interface in=[ /interface/6to4/find where comment~"^tunnelbroker" !disabled ] do={
+    :local Data false;
+    :local InterfaceVal [ /interface/6to4/get $Interface ];
+    :local Comment [ $ParseKeyValueStore ($InterfaceVal->"comment") ];
 
-  :if ($PublicAddress != $InterfaceVal->"local-address") do={
-    :if ([ :len [ /ip/address find where address~("^" . $PublicAddress . "/") ] ] < 1) do={
-      $LogPrintExit2 warning $0 ("The address " . $PublicAddress . " is not configured on your device. NAT by ISP?") false;
+    :for I from=2 to=0 do={
+      :if ($Data = false) do={
+        :do {
+          :set Data ([ /tool/fetch check-certificate=yes-without-crl \
+            ("https://ipv4.tunnelbroker.net/nic/update?hostname=" . $Comment->"id") \
+            user=($Comment->"user") password=($Comment->"pass") output=user as-value ]->"data");
+        } on-error={
+          $LogPrint debug $ScriptName ("Failed downloading, " . $I . " retries pending.");
+          :delay 2s;
+        }
+      }
     }
 
-    $LogPrintExit2 info $0 ("Local address changed, updating tunnel configuration with address: " . $PublicAddress) false;
-    /interface/6to4/set $Interface local-address=$PublicAddress;
+    :if (!($Data ~ "^(good|nochg) ")) do={
+      $LogPrint error $ScriptName ("Failed sending the local address to tunnelbroker or unexpected response!");
+      :set ExitOK true;
+      :error false;
+    }
+
+    :local PublicAddress [ :pick $Data ([ :find $Data " " ] + 1) [ :find $Data "\n" ] ];
+
+    :if ($PublicAddress != $InterfaceVal->"local-address") do={
+      :if ([ :len [ /ip/address find where address~("^" . $PublicAddress . "/") ] ] < 1) do={
+        $LogPrint warning $ScriptName ("The address " . $PublicAddress . " is not configured on your device. NAT by ISP?");
+      }
+
+      $LogPrint info $ScriptName ("Local address changed, updating tunnel configuration with address: " . $PublicAddress);
+      /interface/6to4/set $Interface local-address=$PublicAddress;
+    }
   }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
 }