accesslist-duplicates: add support for wifiwave2

3 files changed, 55 insertions, 4 deletions

diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index b01c90d..85d444e 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -19,8 +19,10 @@
 :local Shown ({});
 
 :foreach AccList in=[ /caps-man/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/wifiwave2/access-list/get $AccList mac-address ];
   :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
   :foreach SeenMac in=$Seen do={
     :if ($SeenMac = $Mac) do={
@@ -30,6 +32,7 @@
       }
       :if ($Skip = 0) do={
         /caps-man/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;
         :set Shown ($Shown, $Mac);
 
@@ -38,6 +41,7 @@
         :if ([ :typeof $Remove ] = "num") do={
           :put ("Removing numeric id " . $Remove . "...\n");
           /caps-man/access-list/remove $Remove;
+          /interface/wifiwave2/access-list/remove $Remove;
           /interface/wireless/access-list/remove $Remove;
         }
       }
diff --git a/accesslist-duplicates.wifiwave2.rsc b/accesslist-duplicates.wifiwave2.rsc
new file mode 100644
index 0000000..7c0ecf4
--- /dev/null
+++ b/accesslist-duplicates.wifiwave2.rsc
@@ -0,0 +1,42 @@
+#!rsc by RouterOS
+# RouterOS script: accesslist-duplicates.wifiwave2
+# Copyright (c) 2018-2023 Christian Hesse <mail@eworm.de>
+# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+#
+# 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.wifiwave2";
+:global GlobalFunctionsReady;
+:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+
+:global Read;
+
+:local Seen ({});
+:local Shown ({});
+
+:foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+  :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ];
+  :foreach SeenMac in=$Seen do={
+    :if ($SeenMac = $Mac) do={
+      :local Skip 0;
+      :foreach ShownMac in=$Shown do={
+        :if ($ShownMac = $Mac) do={ :set Skip 1; }
+      }
+      :if ($Skip = 0) do={
+        /interface/wifiwave2/access-list/print where mac-address=$Mac;
+        :set Shown ($Shown, $Mac);
+
+        :put "\nNumeric id to remove, any key to skip!";
+        :local Remove [ :tonum [ $Read ] ];
+        :if ([ :typeof $Remove ] = "num") do={
+          :put ("Removing numeric id " . $Remove . "...\n");
+          /interface/wifiwave2/access-list/remove $Remove;
+        }
+      }
+    }
+  }
+  :set Seen ($Seen, $Mac);
+}
diff --git a/doc/accesslist-duplicates.md b/doc/accesslist-duplicates.md
index c59aebf..e3767e7 100644
--- a/doc/accesslist-duplicates.md
+++ b/doc/accesslist-duplicates.md
@@ -15,14 +15,19 @@ entries in wireless access list.
 Requirements and installation
 -----------------------------
 
-Depending on whether you use CAPsMAN (`/caps-man`) or local wireless
-interface (`/interface/wireless`) you need to install a different script.
+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.
 
-For CAPsMAN:
+For `wifiwave2`:
+
+    $ScriptInstallUpdate accesslist-duplicates.wifiwave2;
+
+For legacy CAPsMAN:
 
     $ScriptInstallUpdate accesslist-duplicates.capsman;
 
-For local interface:
+For legacy local interface:
 
     $ScriptInstallUpdate accesslist-duplicates.local;