From 12d34e4a7c40203aadfb536077c3c2b2cd1492d5 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 8 Jul 2021 21:04:56 +0200 Subject: [PATCH] collect-wireless-mac: remove 'unknown' from message and comment This was true, but the mac address is no longer unknown after it was added to address list in comment. --- collect-wireless-mac.capsman | 2 +- collect-wireless-mac.local | 2 +- collect-wireless-mac.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/collect-wireless-mac.capsman b/collect-wireless-mac.capsman index 18f30d6..cddc5fa 100644 --- a/collect-wireless-mac.capsman +++ b/collect-wireless-mac.capsman @@ -61,7 +61,7 @@ $ScriptLock $0 false 10; } :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]); :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ]; - :local Message ("unknown MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ + :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ "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; diff --git a/collect-wireless-mac.local b/collect-wireless-mac.local index 1e8086e..7ef6b18 100644 --- a/collect-wireless-mac.local +++ b/collect-wireless-mac.local @@ -62,7 +62,7 @@ $ScriptLock $0 false 10; :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ]; :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]); :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ]; - :local Message ("unknown MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ + :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface"); $LogPrintExit2 info $0 $Message false; / interface wireless access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes; diff --git a/collect-wireless-mac.template b/collect-wireless-mac.template index 18bab89..aa3f5bf 100644 --- a/collect-wireless-mac.template +++ b/collect-wireless-mac.template @@ -63,7 +63,7 @@ $ScriptLock $0 false 10; :set ($RegVal->"ssid") [ / interface wireless get [ find where name=($RegVal->"interface") ] ssid ]; :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]); :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ]; - :local Message ("unknown MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ + :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \ "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface"); $LogPrintExit2 info $0 $Message false; / %PATH% access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;