hotspot-to-wpa-cleanup: drop support for wifiwave2

3 files changed, 1 insertions, 88 deletions

diff --git a/doc/hotspot-to-wpa.md b/doc/hotspot-to-wpa.md
index c2a5cc6..fc784dd 100644
--- a/doc/hotspot-to-wpa.md
+++ b/doc/hotspot-to-wpa.md
@@ -40,16 +40,11 @@ With just `hotspot-to-wpa` installed the mac addresses will last in the
 access list forever. Install the optional script for automatic cleanup
 and add a scheduler.
 
-For `wifi` (RouterOS 7.13 and later):
+For `wifi`:
 
     $ScriptInstallUpdate hotspot-to-wpa-cleanup.wifi,lease-script; 
     /system/scheduler/add interval=1d name=hotspot-to-wpa-cleanup on-event="/system/script/run hotspot-to-wpa-cleanup.wifi;" start-time=startup;
 
-For `wifiwave2` (up to RouterOS 7.12):
-
-    $ScriptInstallUpdate hotspot-to-wpa-cleanup.wifiwave2,lease-script;
-    /system/scheduler/add interval=1d name=hotspot-to-wpa-cleanup on-event="/system/script/run hotspot-to-wpa-cleanup.wifiwave2;" start-time=startup;
-
 For legacy CAPsMAN:
 
     $ScriptInstallUpdate hotspot-to-wpa-cleanup.capsman,lease-script;
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index c393888..bba9f0e 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -39,10 +39,8 @@
 
   :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={
@@ -56,18 +54,15 @@
 
   :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;
     }
   }
 
@@ -79,7 +74,6 @@
         " 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;
     }
diff --git a/hotspot-to-wpa-cleanup.wifiwave2.rsc b/hotspot-to-wpa-cleanup.wifiwave2.rsc
deleted file mode 100644
index e5a0cf5..0000000
--- a/hotspot-to-wpa-cleanup.wifiwave2.rsc
+++ /dev/null
@@ -1,76 +0,0 @@
-#!rsc by RouterOS
-# RouterOS script: hotspot-to-wpa-cleanup.wifiwave2
-# Copyright (c) 2021-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
-#
-# provides: lease-script, order=80
-# requires RouterOS, version=7.12
-#
-# manage and clean up private WPA passphrase after hotspot login
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/hotspot-to-wpa.md
-#
-# !! Do not edit this file, it is generated from template!
-
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
-
-  :global EitherOr;
-  :global LogPrintExit2;
-  :global ParseKeyValueStore;
-  :global ScriptLock;
-
-  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :return false;
-  }
-
-  :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=[ /interface/wifiwave2/registration-table/find where comment~"^hotspot-to-wpa:" ] do={
-    :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=[ /interface/wifiwave2/access-list/find where comment~"^hotspot-to-wpa:" \
-      !(comment~[ /system/clock/get date ]) ] do={
-    :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;
-      /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 $ScriptName ("Client with mac address " . ($LeaseVal->"mac-address") . \
-        " was not seen for " . ($LeaseVal->"last-seen") . ", removing.") false;
-      /interface/wifiwave2/access-list/remove [ find where comment~"^hotspot-to-wpa:" \
-        mac-address=($LeaseVal->"mac-address") ];
-      /ip/dhcp-server/lease/remove $Lease;
-    }
-  }
-}
-
-$Main [ :jobname ];