update-tunnelbroker: move code into function

1 files changed, 39 insertions, 34 deletions

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 4d4379a..c61d82e 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -10,51 +10,56 @@
 # update local address of tunnelbroker interface
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/update-tunnelbroker.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global CertificateAvailable;
-:global LogPrintExit2;
-:global ParseKeyValueStore;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+  :global CertificateAvailable;
+  :global LogPrintExit2;
+  :global ParseKeyValueStore;
+  :global ScriptLock;
 
-:if ([ $CertificateAvailable "Starfield Secure Certificate Authority - G2" ] = false) do={
-  $LogPrintExit2 error $0 ("Downloading required certificate failed.") true;
-}
+  $ScriptLock $ScriptName;
 
-: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 ([ $CertificateAvailable "Starfield Secure Certificate Authority - G2" ] = false) do={
+    $LogPrintExit2 error $ScriptName ("Downloading required certificate failed.") true;
   }
 
-  :if (!($Data ~ "^(good|nochg) ")) do={
-    $LogPrintExit2 error $0 ("Failed sending the local address to tunnelbroker or unexpected response!") 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") ];
 
-  :local PublicAddress [ :pick $Data ([ :find $Data " " ] + 1) [ :find $Data "\n" ] ];
+    :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 $ScriptName ("Failed downloading, " . $I . " retries pending.") false;
+          :delay 2s;
+        }
+      }
+    }
 
-  :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;
+    :if (!($Data ~ "^(good|nochg) ")) do={
+      $LogPrintExit2 error $ScriptName ("Failed sending the local address to tunnelbroker or unexpected response!") true;
     }
 
-    $LogPrintExit2 info $0 ("Local address changed, updating tunnel configuration with address: " . $PublicAddress) false;
-    /interface/6to4/set $Interface local-address=$PublicAddress;
+    :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={
+        $LogPrintExit2 warning $ScriptName ("The address " . $PublicAddress . " is not configured on your device. NAT by ISP?") false;
+      }
+
+      $LogPrintExit2 info $ScriptName ("Local address changed, updating tunnel configuration with address: " . $PublicAddress) false;
+      /interface/6to4/set $Interface local-address=$PublicAddress;
+    }
   }
 }
+
+$Main [ :jobname ];