Merge branch 'main-function' into next

1 files changed, 59 insertions, 54 deletions

diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index b7b4d9c..9ffc6ea 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -12,71 +12,76 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global EitherOr;
-:global LogPrintExit2;
-:global ParseKeyValueStore;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0 false 10;
+  :global EitherOr;
+  :global LogPrintExit2;
+  :global ParseKeyValueStore;
+  :global ScriptLock;
 
-:local DHCPServers ({});
-:foreach Server in=[ /ip/dhcp-server/find where comment~"hotspot-to-wpa" ] do={
-  :local ServerVal [ /ip/dhcp-server/get $Server ]
-  :local ServerInfo [ $ParseKeyValueStore ($ServerVal->"comment") ];
-  :if (($ServerInfo->"hotspot-to-wpa") = "wpa") do={
-    :set ($DHCPServers->($ServerVal->"name")) \
-      [ :totime [ $EitherOr ($ServerInfo->"timeout") 4w ] ];
+  $ScriptLock $ScriptName false 10;
+
+  :local DHCPServers ({});
+  :foreach Server in=[ /ip/dhcp-server/find where comment~"hotspot-to-wpa" ] do={
+    :local ServerVal [ /ip/dhcp-server/get $Server ]
+    :local ServerInfo [ $ParseKeyValueStore ($ServerVal->"comment") ];
+    :if (($ServerInfo->"hotspot-to-wpa") = "wpa") do={
+      :set ($DHCPServers->($ServerVal->"name")) \
+        [ :totime [ $EitherOr ($ServerInfo->"timeout") 4w ] ];
+    }
   }
-}
 
-:foreach Client in=[ /caps-man/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
-:foreach Client in=[ /interface/wifi/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
-:foreach Client in=[ /interface/wifiwave2/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
-  :local ClientVal [ /caps-man/registration-table/get $Client ];
-  :local ClientVal [ /interface/wifi/registration-table/get $Client ];
-  :local ClientVal [ /interface/wifiwave2/registration-table/get $Client ];
-  :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic \
-      mac-address=($ClientVal->"mac-address") ] do={
-    :if (($DHCPServers->[ /ip/dhcp-server/lease/get $Lease server ]) > 0s) do={
-      $LogPrintExit2 info $0 ("Client with mac address " . ($ClientVal->"mac-address") . \
-        " connected to WPA, making lease static.") false;
-      /ip/dhcp-server/lease/make-static $Lease;
-      /ip/dhcp-server/lease/set comment=($ClientVal->"comment") $Lease;
+  :foreach Client in=[ /caps-man/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
+  :foreach Client in=[ /interface/wifi/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
+  :foreach Client in=[ /interface/wifiwave2/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
+    :local ClientVal [ /caps-man/registration-table/get $Client ];
+    :local ClientVal [ /interface/wifi/registration-table/get $Client ];
+    :local ClientVal [ /interface/wifiwave2/registration-table/get $Client ];
+    :foreach Lease in=[ /ip/dhcp-server/lease/find where dynamic \
+        mac-address=($ClientVal->"mac-address") ] do={
+      :if (($DHCPServers->[ /ip/dhcp-server/lease/get $Lease server ]) > 0s) do={
+        $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+          " connected to WPA, making lease static.") false;
+        /ip/dhcp-server/lease/make-static $Lease;
+        /ip/dhcp-server/lease/set comment=($ClientVal->"comment") $Lease;
+      }
     }
   }
-}
 
-:foreach Client in=[ /caps-man/access-list/find where comment~"^hotspot-to-wpa:" \
-:foreach Client in=[ /interface/wifi/access-list/find where comment~"^hotspot-to-wpa:" \
-:foreach Client in=[ /interface/wifiwave2/access-list/find where comment~"^hotspot-to-wpa:" \
-    !(comment~[ /system/clock/get date ]) ] do={
-  :local ClientVal [ /caps-man/access-list/get $Client ];
-  :local ClientVal [ /interface/wifi/access-list/get $Client ];
-  :local ClientVal [ /interface/wifiwave2/access-list/get $Client ];
-  :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
-       mac-address=($ClientVal->"mac-address") ] ] = 0) do={
-    $LogPrintExit2 info $0 ("Client with mac address " . ($ClientVal->"mac-address") . \
-      " did not connect to WPA, removing from access list.") false;
-    /caps-man/access-list/remove $Client;
-    /interface/wifi/access-list/remove $Client;
-    /interface/wifiwave2/access-list/remove $Client;
+  :foreach Client in=[ /caps-man/access-list/find where comment~"^hotspot-to-wpa:" \
+  :foreach Client in=[ /interface/wifi/access-list/find where comment~"^hotspot-to-wpa:" \
+  :foreach Client in=[ /interface/wifiwave2/access-list/find where comment~"^hotspot-to-wpa:" \
+      !(comment~[ /system/clock/get date ]) ] do={
+    :local ClientVal [ /caps-man/access-list/get $Client ];
+    :local ClientVal [ /interface/wifi/access-list/get $Client ];
+    :local ClientVal [ /interface/wifiwave2/access-list/get $Client ];
+    :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
+         mac-address=($ClientVal->"mac-address") ] ] = 0) do={
+      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($ClientVal->"mac-address") . \
+        " did not connect to WPA, removing from access list.") false;
+      /caps-man/access-list/remove $Client;
+      /interface/wifi/access-list/remove $Client;
+      /interface/wifiwave2/access-list/remove $Client;
+    }
   }
-}
 
-:foreach Server,Timeout in=$DHCPServers do={
-  :foreach Lease in=[ /ip/dhcp-server/lease/find where !dynamic status="waiting" \
-      server=$Server last-seen>$Timeout comment~"^hotspot-to-wpa:" ] do={
-    :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];
-    $LogPrintExit2 info $0 ("Client with mac address " . ($LeaseVal->"mac-address") . \
-      " was not seen for " . ($LeaseVal->"last-seen") . ", removing.") false;
-    /caps-man/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
-    /interface/wifi/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
-    /interface/wifiwave2/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
-      mac-address=($LeaseVal->"mac-address") ];
-    /ip/dhcp-server/lease/remove $Lease;
+  :foreach Server,Timeout in=$DHCPServers do={
+    :foreach Lease in=[ /ip/dhcp-server/lease/find where !dynamic status="waiting" \
+        server=$Server last-seen>$Timeout comment~"^hotspot-to-wpa:" ] do={
+      :local LeaseVal [ /ip/dhcp-server/lease/get $Lease ];
+      $LogPrintExit2 info $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
+        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.") false;
+      /caps-man/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
+      /interface/wifi/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
+      /interface/wifiwave2/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
+        mac-address=($LeaseVal->"mac-address") ];
+      /ip/dhcp-server/lease/remove $Lease;
+    }
   }
 }
+
+$Main [ :jobname ];