From ba406ae0fe7fedb60a80c6a142b2ec280d478984 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 14 Nov 2023 10:19:05 +0100
Subject: accesslist-duplicates: support new wifi package

---
 accesslist-duplicates.template.rsc |  4 ++++
 accesslist-duplicates.wifi.rsc     | 31 +++++++++++++++++++++++++++++++
 doc/accesslist-duplicates.md       | 15 ++++++++++-----
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 accesslist-duplicates.wifi.rsc

diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index beb7ef2..c83b428 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -18,13 +18,16 @@
 :local Seen ({});
 
 :foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+:foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
 :foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
 :foreach AccList in=[ /interface/wireless/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
   :local Mac [ /caps-man/access-list/get $AccList mac-address ];
+  :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
   :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ];
   :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
   :if ($Seen->$Mac = 1) do={
     /caps-man/access-list/print where mac-address=$Mac;
+    /interface/wifi/access-list/print where mac-address=$Mac;
     /interface/wifiwave2/access-list/print where mac-address=$Mac;
     /interface/wireless/access-list/print where mac-address=$Mac;
     :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
@@ -32,6 +35,7 @@
     :if ([ :typeof $Remove ] = "num") do={
       :put ("Removing numeric id " . $Remove . "...\n");
       /caps-man/access-list/remove $Remove;
+      /interface/wifi/access-list/remove $Remove;
       /interface/wifiwave2/access-list/remove $Remove;
       /interface/wireless/access-list/remove $Remove;
     }
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
new file mode 100644
index 0000000..4ca8be8
--- /dev/null
+++ b/accesslist-duplicates.wifi.rsc
@@ -0,0 +1,31 @@
+#!rsc by RouterOS
+# RouterOS script: accesslist-duplicates.wifi
+# Copyright (c) 2018-2023 Christian Hesse <mail@eworm.de>
+# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+#
+# requires RouterOS, version=7.12beta1
+#
+# print duplicate antries in wireless access list
+# https://git.eworm.de/cgit/routeros-scripts/about/doc/accesslist-duplicates.md
+#
+# !! Do not edit this file, it is generated from template!
+
+:local 0 "accesslist-duplicates.wifi";
+:global GlobalFunctionsReady;
+:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+
+:local Seen ({});
+
+:foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+  :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
+  :if ($Seen->$Mac = 1) do={
+    /interface/wifi/access-list/print where mac-address=$Mac;
+    :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+
+    :if ([ :typeof $Remove ] = "num") do={
+      :put ("Removing numeric id " . $Remove . "...\n");
+      /interface/wifi/access-list/remove $Remove;
+    }
+  }
+  :set ($Seen->$Mac) 1;
+}
diff --git a/doc/accesslist-duplicates.md b/doc/accesslist-duplicates.md
index ba5ac4b..7cb0bc2 100644
--- a/doc/accesslist-duplicates.md
+++ b/doc/accesslist-duplicates.md
@@ -17,11 +17,16 @@ entries in wireless access list.
 Requirements and installation
 -----------------------------
 
-Depending on whether you use `wifiwave2` package (`/interface/wifiwave2`)
-or legacy wifi with CAPsMAN (`/caps-man`) or local wireless interface
-(`/interface/wireless`) you need to install a different script.
+Depending on whether you use `wifi` package (`/interface/wifi`), `wifiwave2`
+package (`/interface/wifiwave2`), legacy wifi with CAPsMAN (`/caps-man`)
+or local wireless interface (`/interface/wireless`) you need to install a
+different script.
 
-For `wifiwave2`:
+For `wifi` (RouterOS 7.13 and later):
+
+    $ScriptInstallUpdate accesslist-duplicates.wifi;
+
+For `wifiwave2` (up to RouterOS 7.12):
 
     $ScriptInstallUpdate accesslist-duplicates.wifiwave2;
 
@@ -38,7 +43,7 @@ Usage and invocation
 
 Run this script from a terminal:
 
-    /system/script/run accesslist-duplicates.local;
+    /system/script/run accesslist-duplicates.wifi;
 
 ![screenshot: example](accesslist-duplicates.d/01-example.avif)
 
-- 
cgit v1.2.3-70-g09d2