1 files changed, 31 insertions, 21 deletions
diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index ac01c97..f16d73f 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -1,34 +1,44 @@
 #!rsc by RouterOS
 # RouterOS script: ppp-on-up
-# Copyright (c) 2013-2023 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
+#
+# requires RouterOS, version=7.15
 #
 # run scripts on ppp up
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/ppp-on-up.md
+# https://rsc.eworm.de/doc/ppp-on-up.md
 
-:local 0 "ppp-on-up";
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:local ExitOK false;
+:onerror Err {
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
+  :local ScriptName [ :jobname ];
 
-:global LogPrintExit2;
+  :global LogPrint;
 
-:local Interface $interface;
+  :local Interface $interface;
 
-:if ([ :typeof $Interface ] = "nothing") do={
-  $LogPrintExit2 error $0 ("This script is supposed to run from ppp on-up script hook.") true;
-}
+  :if ([ :typeof $Interface ] = "nothing") do={
+    $LogPrint error $ScriptName ("This script is supposed to run from ppp on-up script hook.");
+    :set ExitOK true;
+    :error false;
+  }
 
-:local IntName [ /interface/get $Interface name ];
-$LogPrintExit2 info $0 ("PPP interface " . $IntName . " is up.") false;
+  :local IntName [ /interface/get $Interface name ];
+  $LogPrint info $ScriptName ("PPP interface " . $IntName . " is up.");
 
-/ipv6/dhcp-client/release [ find where interface=$IntName !disabled ];
+  /ipv6/dhcp-client/release [ find where interface=$IntName !disabled bound ];
 
-:foreach Script in=[ /system/script/find where source~("\n# provides: ppp-on-up\n") ] do={
-  :local ScriptName [ /system/script/get $Script name ];
-  :do {
-    $LogPrintExit2 debug $0 ("Running script: " . $ScriptName) false;
-    /system/script/run $Script;
-  } on-error={
-    $LogPrintExit2 warning $0 ("Running script '" . $ScriptName . "' failed!") false;
+  :foreach Script in=[ /system/script/find where source~("\n# provides: ppp-on-up\r?\n") ] do={
+    :local ScriptName [ /system/script/get $Script name ];
+    :do {
+      $LogPrint debug $ScriptName ("Running script: " . $ScriptName);
+      /system/script/run $Script;
+    } on-error={
+      $LogPrint warning $ScriptName ("Running script '" . $ScriptName . "' failed!");
+    }
   }
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }