From e5674dec240cb3abfa71d9a3be76403b40301722 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 6 Jul 2021 22:37:49 +0200 Subject: collect-wireless-mac: use $EitherOr and simplify code --- collect-wireless-mac.local | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'collect-wireless-mac.local') diff --git a/collect-wireless-mac.local b/collect-wireless-mac.local index 109ec5c..6c07044 100644 --- a/collect-wireless-mac.local +++ b/collect-wireless-mac.local @@ -16,6 +16,7 @@ :global Identity; +:global EitherOr; :global GetMacVendor; :global LogPrintExit2; :global ScriptLock; @@ -51,10 +52,7 @@ $ScriptLock $0 false 10; :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0); :if ([ :len $Lease ] > 0) do={ :set Address [ / ip dhcp-server lease get $Lease address ]; - :set HostName [ / ip dhcp-server lease get $Lease host-name ]; - :if ([ :len $HostName ] = 0) do={ - :set HostName "no hostname"; - } + :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ]; :set DnsName "no dns name"; :local DnsRec ([ / ip dns static find where address=$Address ]->0); :if ([ :len $DnsRec ] > 0) do={ -- cgit v1.2.3-54-g00ecf