collect-wireless-mac: add support for wifiwave2

1 files changed, 8 insertions, 0 deletions

diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index b3618ee..df6b831 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -28,19 +28,24 @@
 $ScriptLock $0 false 10;
 
 :if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
+:if ([ :len [ /interface/wifiwave2/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
 :if ([ :len [ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
   /caps-man/access-list/add comment="--- collected above ---" disabled=yes;
+  /interface/wifiwave2/access-list/add comment="--- collected above ---" disabled=yes;
   /interface/wireless/access-list/add comment="--- collected above ---" disabled=yes;
   $LogPrintExit2 warning $0 ("Added disabled access-list entry with comment '--- collected above ---'.") false;
 }
 :local PlaceBefore ([ /caps-man/access-list/find where comment="--- collected above ---" disabled ]->0);
+:local PlaceBefore ([ /interface/wifiwave2/access-list/find where comment="--- collected above ---" disabled ]->0);
 :local PlaceBefore ([ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ]->0);
 
 :foreach Reg in=[ /caps-man/registration-table/find ] do={
+:foreach Reg in=[ /interface/wifiwave2/registration-table/find ] do={
 :foreach Reg in=[ /interface/wireless/registration-table/find ] do={
   :local RegVal;
   :do {
     :set RegVal [ /caps-man/registration-table/get $Reg ];
+    :set RegVal [ /interface/wifiwave2/registration-table/get $Reg ];
     :set RegVal [ /interface/wireless/registration-table/get $Reg ];
   } on-error={
     $LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
@@ -48,10 +53,12 @@ $ScriptLock $0 false 10;
 
   :if ([ :len ($RegVal->"mac-address") ] > 0) do={
     :local AccessList ([ /caps-man/access-list/find where mac-address=($RegVal->"mac-address") ]->0);
+    :local AccessList ([ /interface/wifiwave2/access-list/find where mac-address=($RegVal->"mac-address") ]->0);
     :local AccessList ([ /interface/wireless/access-list/find where mac-address=($RegVal->"mac-address") ]->0);
     :if ([ :len $AccessList ] > 0) do={
       $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
         [ /caps-man/access-list/get $AccessList comment ]) false;
+        [ /interface/wifiwave2/access-list/get $AccessList comment ]) false;
         [ /interface/wireless/access-list/get $AccessList comment ]) false;
     }
 
@@ -76,6 +83,7 @@ $ScriptLock $0 false 10;
         "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
       $LogPrintExit2 info $0 $Message false;
       /caps-man/access-list/add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
+      /interface/wifiwave2/access-list/add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
       /interface/wireless/access-list/add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
       $SendNotification2 ({ origin=$0; \
         subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \