Commit graph

47 commits

Author SHA1 Message Date
Christian Hesse
12d34e4a7c 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.
2021-07-09 10:40:13 +02:00
Christian Hesse
6bf8cd5fac lease-script: implement script order
The order may be important: `collect-wireless-mac` can add a dns name
in notification, thus `dhcp-to-dns` should run first.
2021-07-08 21:03:31 +02:00
Christian Hesse
623fd707c4 lease-script: modify the tag 2021-07-08 16:09:03 +02:00
Christian Hesse
e5674dec24 collect-wireless-mac: use $EitherOr and simplify code 2021-07-07 00:33:34 +02:00
Christian Hesse
c982cde0bd collect-wireless-mac: do not fail on missing dns record 2021-07-07 00:32:50 +02:00
Christian Hesse
5083ffd12f collect-wireless-mac: rework, more use of arrays 2021-07-06 21:41:33 +02:00
Christian Hesse
877e95d4be collect-wireless-mac: properly handle vanished device 2021-07-01 22:52:38 +02:00
Christian Hesse
df43f61018 collect-wireless-mac: wait when locking script 2021-07-01 22:52:38 +02:00
Christian Hesse
2041390f55 lease-script: use 'provides' to find lease scripts 2021-06-23 08:38:44 +02:00
Christian Hesse
714a679402 collect-wireless-mac: pass origin to $SendNotification2 2021-04-28 13:58:37 +02:00
Christian Hesse
1ca3e8b59f collect-wireless-mac: use $SendNotification2 2021-04-28 13:58:37 +02:00
Christian Hesse
041ca062b1 global: use $0 for $ScriptLock 2021-02-24 21:51:56 +01:00
Christian Hesse
f46db91845 global: give script or function name in log messages 2021-02-24 21:51:54 +01:00
Christian Hesse
d5afc79eed global: drop script 'global-wait'
All scripts wait for the global functions on their own now.
2021-02-18 21:45:38 +01:00
Christian Hesse
c18f753338 collect-wireless-mac: always use first entry to place before 2021-01-03 20:33:32 +01:00
Christian Hesse
547fbc630a update copyright for 2021 2021-01-01 21:33:52 +01:00
Daniel Ziegenberg
ca6668950b collect-wireless-mac: always select first lease from dhcp-server
The script fails at setting the hostname when there are multiple leases
for a mac address.

In line 36 and 37 the hostname gets set from the data the lease. When there
is more than one lease for a specific mac address this fails with the message
"invalid internal item number". More than one lease for a mac address is
possible, if you have more than one SSID on a capsman and a single device
can login into more than one SSID.

Fixes #10

Signed-off-by: Christian Hesse <mail@eworm.de>
2020-12-30 12:42:03 +01:00
Christian Hesse
956244d53b collect-wireless-mac: add symbol in notification 2020-09-18 13:11:33 +02:00
Christian Hesse
49737af6d1 extend magic pattern with "by RouterOS"
This matches the string included in export.
2020-09-18 11:00:27 +02:00
Christian Hesse
ff5cdc3019 [ ... print count-only ...] -> [ :len [ ... find ... ] ]
Using 'print count-only' always prints a number to terminal, even if the
value is evaluated in a condition or assigned to a variable. This can be
quite annoying. Behavior will not chance (SUP-25503), so replacing the
code...
2020-08-26 09:29:52 +02:00
Christian Hesse
71ad56aacc explicitly name the license
Copyright (C) 2013-2020 Christian Hesse <mail@eworm.de>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

https://www.gnu.org/licenses/#GPL
https://www.gnu.org/licenses/gpl.html
https://www.gnu.org/licenses/gpl.md
2020-06-19 22:17:42 +02:00
Christian Hesse
79e7b3229f add doc/collect-wireless-mac.md 2020-03-27 22:12:49 +01:00
Christian Hesse
bf41a8d48a always use severity 'warning', not just 'warn' 2020-03-05 09:18:23 +01:00
Christian Hesse
1dbd91f76d collect-wireless-mac: use $LogPrintExit 2020-03-05 08:22:47 +01:00
Christian Hesse
001e7eeb39 global-functions: sort alphabetically 2020-02-28 15:26:26 +01:00
Christian Hesse
958bfa7ce8 collect-wireless-mac: automatically add missing access-list entry 2020-01-17 10:36:03 +01:00
Christian Hesse
aa885e17e2 collect-wireless-mac: use dynamic & bound mac address only 2020-01-06 09:47:32 +01:00
Christian Hesse
afb9839073 update copyright for 2020 2020-01-01 17:00:39 +01:00
Christian Hesse
a8a0523d33 collect-wireless-mac: add the dns name 2019-11-25 17:07:45 +01:00
Christian Hesse
15a6fb325e collect-wireless-mac: lease without address should be impossible...
... we need the check for empty hostname, though.
2019-11-25 16:43:19 +01:00
Christian Hesse
b70d4f7666 collect-wireless-mac: move code into condition 2019-11-25 16:39:23 +01:00
Christian Hesse
b35c0b8a6f always write warnings and errors to log 2019-04-03 21:30:43 +02:00
Christian Hesse
e72b3dd4f1 collect-wireless-mac: use $ScriptLock 2019-02-21 20:16:03 +01:00
Christian Hesse
1ca1b48bcd collect-wireless-mac: simplify array access 2019-01-15 10:38:47 +01:00
Christian Hesse
870f00bb36 global: variable names are CamelCase
___  _         ___     __
           / _ )(_)__ _   / _/__ _/ /_
          / _  / / _ `/  / _/ _ `/ __/
         /____/_/\_, /  /_/ \_,_/\__/
 _       __     /___/       _             __
| |     / /___ __________  (_)___  ____ _/ /
| | /| / / __ `/ ___/ __ \/ / __ \/ __ `/ /
| |/ |/ / /_/ / /  / / / / / / / / /_/ /_/
|__/|__/\__,_/_/  /_/ /_/_/_/ /_/\__, (_)
                                /____/

RouterOS has some odd behavior when it comes to variable names. Let's
have a look at the interfaces:

[admin@MikroTik] > / interface print where name=en1
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU
 0  RS en1                                 ether            1500  1598

That looks ok. Now we use a script:

{ :local interface "en1";
  / interface print where name=$interface; }

And the result...

[admin@MikroTik] > { :local interface "en1";
{...   / interface print where name=$interface; }
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU
 0  RS en1                                 ether            1500  1598

... still looks ok.
We make a little modification to the script:

{ :local name "en1";
  / interface print where name=$name; }

And the result:

[admin@MikroTik] > { :local name "en1";
{...   / interface print where name=$name; }
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU
 0  RS en1                                 ether            1500  1598
 1   S en2                                 ether            1500  1598
 2   S en3                                 ether            1500  1598
 3   S en4                                 ether            1500  1598
 4   S en5                                 ether            1500  1598
 5  R  br-local                            bridge           1500  1598

Ups! The filter has no effect!
That happens whenever the variable name ($name) matches the property
name (name=).

And another modification:

{ :local type "en1";
  / interface print where name=$type; }

And the result:

[admin@MikroTik] > { :local type "en1";
{...   / interface print where name=$type; }
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU

Ups! Nothing?
Even if the variable name ($type) matches whatever property name (type=)
things go wrong.

The answer from MikroTik support (in Ticket#2019010222000454):

> This is how scripting works in RouterOS and we will not fix it.

To get around this we use variable names in CamelCase. Let's hope
Mikrotik never ever introduces property names in CamelCase...

*fingers crossed*
2019-01-04 12:35:34 +01:00
Christian Hesse
472cd3d905 update copyright for 2019 2019-01-02 09:38:34 +01:00
Christian Hesse
3cdd0fb94b global-functions: properly define global functions 2018-12-28 22:56:29 +01:00
Christian Hesse
ee5eefefc3 global-functions: add $GetMacVendor 2018-12-27 00:48:56 +01:00
Christian Hesse
f4673928ef global-functions: make $CertificateAvailable work on CommonName
This should prevent endless certificate switching for Let's Encrypt
cross-signed intermediate certificates.
2018-12-20 22:21:00 +01:00
Christian Hesse
b8830ee6a5 collect-wireless-mac: send the mac's vendor part only 2018-12-14 12:48:01 +01:00
Christian Hesse
eda89ba643 collect-wireless-mac: get and record the vendor 2018-12-14 12:35:06 +01:00
Christian Hesse
6e4d715937 global-functions: add identity tag in $SendNotification
... and send subject in telegram message.
2018-11-28 21:19:39 +01:00
Christian Hesse
1bbbe3a5a7 global: remove unused variables 2018-10-10 21:49:46 +02:00
Christian Hesse
f262ff99a8 collect-wireless-mac: use function for notification 2018-10-09 15:57:53 +02:00
Christian Hesse
be673737d3 start scripts with a magic token / shebang 2018-09-27 00:18:43 +02:00
Christian Hesse
07e54dd88b add empty comment at first line...
... for better formatting in export.
2018-08-24 16:58:30 +02:00
Christian Hesse
c66bb89be2 update template system 2018-07-10 14:01:41 +02:00
Renamed from collect-wireless-mac.in (Browse further)