Merge branch 'main-function' into next

1 files changed, 54 insertions, 49 deletions

diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index 512ef68..ff445e6 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -8,67 +8,72 @@
 # and add/remove/update DNS entries from IPSec mode-config
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/ipsec-to-dns.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global Domain;
-:global HostNameInZone;
-:global Identity;
-:global PrefixInZone;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-:global CharacterReplace;
-:global EscapeForRegEx;
-:global IfThenElse;
-:global LogPrintExit2;
-:global ScriptLock;
+  :global Domain;
+  :global HostNameInZone;
+  :global Identity;
+  :global PrefixInZone;
 
-$ScriptLock $0;
+  :global CharacterReplace;
+  :global EscapeForRegEx;
+  :global IfThenElse;
+  :global LogPrintExit2;
+  :global ScriptLock;
 
-:local Zone \
-  ([ $IfThenElse ($PrefixInZone = true) "ipsec." ] . \
-   [ $IfThenElse ($HostNameInZone = true) ($Identity . ".") ] . $Domain);
-:local Ttl 5m;
-:local CommentPrefix ("managed by " . $0 . " for ");
-:local CommentString ("--- " . $0 . " above ---");
+  $ScriptLock $ScriptName;
 
-:if ([ :len [ /ip/dns/static/find where (name=$CommentString or (comment=$CommentString and name=-)) type=NXDOMAIN disabled ] ] = 0) do={
-  /ip/dns/static/add name=$CommentString type=NXDOMAIN disabled=yes;
-  $LogPrintExit2 warning $0 ("Added disabled static dns record with name '" . $CommentString . "'.") false;
-}
-:local PlaceBefore ([ /ip/dns/static/find where (name=$CommentString or (comment=$CommentString and name=-)) type=NXDOMAIN disabled ]->0);
+  :local Zone \
+    ([ $IfThenElse ($PrefixInZone = true) "ipsec." ] . \
+     [ $IfThenElse ($HostNameInZone = true) ($Identity . ".") ] . $Domain);
+  :local Ttl 5m;
+  :local CommentPrefix ("managed by " . $ScriptName . " for ");
+  :local CommentString ("--- " . $ScriptName . " above ---");
 
-:foreach DnsRecord in=[ /ip/dns/static/find where comment~("^" . $CommentPrefix) ] do={
-  :local DnsRecordVal [ /ip/dns/static/get $DnsRecord ];
-  :local PeerId [ $CharacterReplace ($DnsRecordVal->"comment") $CommentPrefix "" ];
-  :if ([ :len [ /ip/ipsec/active-peers/find where id~("^(CN=)?" . [ $EscapeForRegEx $PeerId ] . "\$") \
-       dynamic-address=($DnsRecordVal->"address") ] ] > 0) do={
-    $LogPrintExit2 debug $0 ("Peer " . $PeerId . " (" . $DnsRecordVal->"name" . ") still exists. Not deleting DNS entry.") false;
-  } else={
-    :local Found false;
-    $LogPrintExit2 info $0 ("Peer " . $PeerId . " (" . $DnsRecordVal->"name" . ") has gone, deleting DNS entry.") false;
-    /ip/dns/static/remove $DnsRecord;
+  :if ([ :len [ /ip/dns/static/find where (name=$CommentString or (comment=$CommentString and name=-)) type=NXDOMAIN disabled ] ] = 0) do={
+    /ip/dns/static/add name=$CommentString type=NXDOMAIN disabled=yes;
+    $LogPrintExit2 warning $ScriptName ("Added disabled static dns record with name '" . $CommentString . "'.") false;
   }
-}
+  :local PlaceBefore ([ /ip/dns/static/find where (name=$CommentString or (comment=$CommentString and name=-)) type=NXDOMAIN disabled ]->0);
 
-:foreach Peer in=[ /ip/ipsec/active-peers/find where !(dynamic-address=[]) ] do={
-  :local PeerVal [ /ip/ipsec/active-peers/get $Peer ];
-  :local PeerId [ $CharacterReplace ($PeerVal->"id") "CN=" "" ];
-  :local Comment ($CommentPrefix . $PeerId);
-  :local HostName [ :pick $PeerId 0 [ :find ($PeerId . ".") "." ] ];
+  :foreach DnsRecord in=[ /ip/dns/static/find where comment~("^" . $CommentPrefix) ] do={
+    :local DnsRecordVal [ /ip/dns/static/get $DnsRecord ];
+    :local PeerId [ $CharacterReplace ($DnsRecordVal->"comment") $CommentPrefix "" ];
+    :if ([ :len [ /ip/ipsec/active-peers/find where id~("^(CN=)?" . [ $EscapeForRegEx $PeerId ] . "\$") \
+         dynamic-address=($DnsRecordVal->"address") ] ] > 0) do={
+      $LogPrintExit2 debug $ScriptName ("Peer " . $PeerId . " (" . $DnsRecordVal->"name" . ") still exists. Not deleting DNS entry.") false;
+    } else={
+      :local Found false;
+      $LogPrintExit2 info $ScriptName ("Peer " . $PeerId . " (" . $DnsRecordVal->"name" . ") has gone, deleting DNS entry.") false;
+      /ip/dns/static/remove $DnsRecord;
+    }
+  }
+
+  :foreach Peer in=[ /ip/ipsec/active-peers/find where !(dynamic-address=[]) ] do={
+    :local PeerVal [ /ip/ipsec/active-peers/get $Peer ];
+    :local PeerId [ $CharacterReplace ($PeerVal->"id") "CN=" "" ];
+    :local Comment ($CommentPrefix . $PeerId);
+    :local HostName [ :pick $PeerId 0 [ :find ($PeerId . ".") "." ] ];
 
-  :local Fqdn ($HostName . "." . $Zone);
-  :local DnsRecord [ /ip/dns/static/find where name=$Fqdn ];
-  :if ([ :len $DnsRecord ] > 0) do={
-    :local DnsIp [ /ip/dns/static/get $DnsRecord address ];
-    :if ($DnsIp = $PeerVal->"dynamic-address") do={
-      $LogPrintExit2 debug $0 ("DNS entry for " . $Fqdn . " does not need updating.") false;
+    :local Fqdn ($HostName . "." . $Zone);
+    :local DnsRecord [ /ip/dns/static/find where name=$Fqdn ];
+    :if ([ :len $DnsRecord ] > 0) do={
+      :local DnsIp [ /ip/dns/static/get $DnsRecord address ];
+      :if ($DnsIp = $PeerVal->"dynamic-address") do={
+        $LogPrintExit2 debug $ScriptName ("DNS entry for " . $Fqdn . " does not need updating.") false;
+      } else={
+        $LogPrintExit2 info $ScriptName ("Replacing DNS entry for " . $Fqdn . ", new address is " . $PeerVal->"dynamic-address" . ".") false;
+        /ip/dns/static/set name=$Fqdn address=($PeerVal->"dynamic-address") ttl=$Ttl comment=$Comment $DnsRecord;
+      }
     } else={
-      $LogPrintExit2 info $0 ("Replacing DNS entry for " . $Fqdn . ", new address is " . $PeerVal->"dynamic-address" . ".") false;
-      /ip/dns/static/set name=$Fqdn address=($PeerVal->"dynamic-address") ttl=$Ttl comment=$Comment $DnsRecord;
+      $LogPrintExit2 info $ScriptName ("Adding new DNS entry for " . $Fqdn . ", address is " . $PeerVal->"dynamic-address" . ".") false;
+      /ip/dns/static/add name=$Fqdn address=($PeerVal->"dynamic-address") ttl=$Ttl comment=$Comment place-before=$PlaceBefore;
     }
-  } else={
-    $LogPrintExit2 info $0 ("Adding new DNS entry for " . $Fqdn . ", address is " . $PeerVal->"dynamic-address" . ".") false;
-    /ip/dns/static/add name=$Fqdn address=($PeerVal->"dynamic-address") ttl=$Ttl comment=$Comment place-before=$PlaceBefore;
   }
 }
+
+$Main [ :jobname ];