diff options
| author |  Christian Hesse <mail@eworm.de> | 2023-04-21 00:03:55 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2023-04-24 22:26:26 +0200 |
| commit | b705ceae591205b5eba54ee2f6a1ffb9066f2779 (patch) | |
| tree | d3a9fd7a4354b4cc96e8232a4583905fdcae2301 | |
| parent | 3f9480f9f2c89ab80cacdc7f8b850707d757ab43 (diff) | |
collect-wireless-mac: use $FormatLine
| -rw-r--r-- | collect-wireless-mac.capsman.rsc | 19 | ||||
| -rw-r--r-- | collect-wireless-mac.local.rsc | 19 | ||||
| -rw-r--r-- | collect-wireless-mac.template.rsc | 19 |
3 files changed, 30 insertions, 27 deletions
diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc index e814fa9..094ffc0 100644 --- a/collect-wireless-mac.capsman.rsc +++ b/collect-wireless-mac.capsman.rsc @@ -17,6 +17,7 @@ :global Identity; :global EitherOr; +:global FormatLine; :global GetMacVendor; :global LogPrintExit2; :global ScriptLock; @@ -69,15 +70,15 @@ $ScriptLock $0 false 10; $SendNotification2 ({ origin=$0; \ subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \ message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \ - "Controller: " . $Identity . "\n" . \ - "Interface: " . $RegVal->"interface" . "\n" . \ - "SSID: " . $RegVal->"ssid" . "\n" . \ - "MAC: " . $RegVal->"mac-address" . "\n" . \ - "Vendor: " . $Vendor . "\n" . \ - "Hostname: " . $HostName . "\n" . \ - "Address: " . $Address . "\n" . \ - "DNS name: " . $DnsName . "\n" . \ - "Date: " . $DateTime) }); + [ $FormatLine "Controller" $Identity ] . "\n" . \ + [ $FormatLine "Interface" ($RegVal->"interface") ] . "\n" . \ + [ $FormatLine "SSID" ($RegVal->"ssid") ] . "\n" . \ + [ $FormatLine "MAC" ($RegVal->"mac-address") ] . "\n" . \ + [ $FormatLine "Vendor" $Vendor ] . "\n" . \ + [ $FormatLine "Hostname" $HostName ] . "\n" . \ + [ $FormatLine "Address" $Address ] . "\n" . \ + [ $FormatLine "DNS name" $DnsName ] . "\n" . \ + [ $FormatLine "Date" $DateTime ]) }); } } else={ $LogPrintExit2 debug $0 ("No mac address available... Ignoring.") false; diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc index ee07f54..23eb9fa 100644 --- a/collect-wireless-mac.local.rsc +++ b/collect-wireless-mac.local.rsc @@ -17,6 +17,7 @@ :global Identity; :global EitherOr; +:global FormatLine; :global GetMacVendor; :global LogPrintExit2; :global ScriptLock; @@ -70,15 +71,15 @@ $ScriptLock $0 false 10; $SendNotification2 ({ origin=$0; \ subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \ message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \ - "Controller: " . $Identity . "\n" . \ - "Interface: " . $RegVal->"interface" . "\n" . \ - "SSID: " . $RegVal->"ssid" . "\n" . \ - "MAC: " . $RegVal->"mac-address" . "\n" . \ - "Vendor: " . $Vendor . "\n" . \ - "Hostname: " . $HostName . "\n" . \ - "Address: " . $Address . "\n" . \ - "DNS name: " . $DnsName . "\n" . \ - "Date: " . $DateTime) }); + [ $FormatLine "Controller" $Identity ] . "\n" . \ + [ $FormatLine "Interface" ($RegVal->"interface") ] . "\n" . \ + [ $FormatLine "SSID" ($RegVal->"ssid") ] . "\n" . \ + [ $FormatLine "MAC" ($RegVal->"mac-address") ] . "\n" . \ + [ $FormatLine "Vendor" $Vendor ] . "\n" . \ + [ $FormatLine "Hostname" $HostName ] . "\n" . \ + [ $FormatLine "Address" $Address ] . "\n" . \ + [ $FormatLine "DNS name" $DnsName ] . "\n" . \ + [ $FormatLine "Date" $DateTime ]) }); } } else={ $LogPrintExit2 debug $0 ("No mac address available... Ignoring.") false; diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc index c315385..a8983d9 100644 --- a/collect-wireless-mac.template.rsc +++ b/collect-wireless-mac.template.rsc @@ -18,6 +18,7 @@ :global Identity; :global EitherOr; +:global FormatLine; :global GetMacVendor; :global LogPrintExit2; :global ScriptLock; @@ -71,15 +72,15 @@ $ScriptLock $0 false 10; $SendNotification2 ({ origin=$0; \ subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \ message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \ - "Controller: " . $Identity . "\n" . \ - "Interface: " . $RegVal->"interface" . "\n" . \ - "SSID: " . $RegVal->"ssid" . "\n" . \ - "MAC: " . $RegVal->"mac-address" . "\n" . \ - "Vendor: " . $Vendor . "\n" . \ - "Hostname: " . $HostName . "\n" . \ - "Address: " . $Address . "\n" . \ - "DNS name: " . $DnsName . "\n" . \ - "Date: " . $DateTime) }); + [ $FormatLine "Controller" $Identity ] . "\n" . \ + [ $FormatLine "Interface" ($RegVal->"interface") ] . "\n" . \ + [ $FormatLine "SSID" ($RegVal->"ssid") ] . "\n" . \ + [ $FormatLine "MAC" ($RegVal->"mac-address") ] . "\n" . \ + [ $FormatLine "Vendor" $Vendor ] . "\n" . \ + [ $FormatLine "Hostname" $HostName ] . "\n" . \ + [ $FormatLine "Address" $Address ] . "\n" . \ + [ $FormatLine "DNS name" $DnsName ] . "\n" . \ + [ $FormatLine "Date" $DateTime ]) }); } } else={ $LogPrintExit2 debug $0 ("No mac address available... Ignoring.") false; |