mirror of
https://github.com/eworm-de/routeros-scripts.git
synced 2026-08-01 14:11:35 +00:00
hotspot-to-wpa: early exit with :exit
This commit is contained in:
parent
627145ba07
commit
8d69d84576
4 changed files with 13 additions and 22 deletions
|
|
@ -4,7 +4,7 @@ Use WPA network with hotspot credentials
|
|||
[](https://github.com/eworm-de/routeros-scripts/stargazers)
|
||||
[](https://github.com/eworm-de/routeros-scripts/network)
|
||||
[](https://github.com/eworm-de/routeros-scripts/watchers)
|
||||
[](https://mikrotik.com/download/changelogs/)
|
||||
[](https://mikrotik.com/download/changelogs/)
|
||||
[](https://t.me/routeros_scripts)
|
||||
[](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (c) 2019-2026 Christian Hesse <mail@eworm.de>
|
||||
# https://rsc.eworm.de/COPYING.md
|
||||
#
|
||||
# requires RouterOS, version=7.21
|
||||
# requires RouterOS, version=7.22
|
||||
# requires device-mode, hotspot
|
||||
# requires policy, policy=read;write
|
||||
#
|
||||
|
|
@ -12,7 +12,6 @@
|
|||
#
|
||||
# !! Do not edit this file, it is generated from template!
|
||||
|
||||
:local ExitOK false;
|
||||
:onerror Err {
|
||||
:local ScriptName [ :jobname ];
|
||||
|
||||
|
|
@ -25,16 +24,14 @@
|
|||
:if ([ /caps-man/access-list/find where \
|
||||
comment=("hotspot-to-wpa template " . $Hotspot) disabled action="reject" ] ] > 0) do={
|
||||
:log info ($ScriptName . ": Ignoring login for " . $MacAddress . " on hotspot '" . $Hotspot . "'.");
|
||||
:set ExitOK true;
|
||||
:error false;
|
||||
:exit;
|
||||
}
|
||||
|
||||
:local Lease [ /ip/dhcp-server/lease/find where mac-address=$MacAddress address=$Address ];
|
||||
|
||||
:if ([ :len $Lease ] != 1) do={
|
||||
:log warning ($ScriptName . ": Did not find exactly one lease for " . $MacAddress . "!");
|
||||
:set ExitOK true;
|
||||
:error false;
|
||||
:exit;
|
||||
}
|
||||
|
||||
/ip/dhcp-server/lease/set \
|
||||
|
|
@ -48,5 +45,5 @@
|
|||
:delay 1s;
|
||||
/ip/dhcp-server/lease/disable $Lease;
|
||||
} do={
|
||||
:if ($ExitOK = false) do={ :log error ([ :jobname ] . ": " . $Err); }
|
||||
:log error ([ :jobname ] . ": " . $Err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (c) 2019-2026 Christian Hesse <mail@eworm.de>
|
||||
# https://rsc.eworm.de/COPYING.md
|
||||
#
|
||||
# requires RouterOS, version=7.21
|
||||
# requires RouterOS, version=7.22
|
||||
# requires device-mode, hotspot
|
||||
# requires policy, policy=read;write
|
||||
#
|
||||
|
|
@ -13,7 +13,6 @@
|
|||
# !! This is just a template to generate the real script!
|
||||
# !! Pattern '%TEMPL%' is replaced, paths are filtered.
|
||||
|
||||
:local ExitOK false;
|
||||
:onerror Err {
|
||||
:local ScriptName [ :jobname ];
|
||||
|
||||
|
|
@ -27,16 +26,14 @@
|
|||
:if ([ :len [ /interface/wifi/access-list/find where \
|
||||
comment=("hotspot-to-wpa template " . $Hotspot) disabled action="reject" ] ] > 0) do={
|
||||
:log info ($ScriptName . ": Ignoring login for " . $MacAddress . " on hotspot '" . $Hotspot . "'.");
|
||||
:set ExitOK true;
|
||||
:error false;
|
||||
:exit;
|
||||
}
|
||||
|
||||
:local Lease [ /ip/dhcp-server/lease/find where mac-address=$MacAddress address=$Address ];
|
||||
|
||||
:if ([ :len $Lease ] != 1) do={
|
||||
:log warning ($ScriptName . ": Did not find exactly one lease for " . $MacAddress . "!");
|
||||
:set ExitOK true;
|
||||
:error false;
|
||||
:exit;
|
||||
}
|
||||
|
||||
/ip/dhcp-server/lease/set \
|
||||
|
|
@ -50,5 +47,5 @@
|
|||
:delay 1s;
|
||||
/ip/dhcp-server/lease/disable $Lease;
|
||||
} do={
|
||||
:if ($ExitOK = false) do={ :log error ([ :jobname ] . ": " . $Err); }
|
||||
:log error ([ :jobname ] . ": " . $Err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Copyright (c) 2019-2026 Christian Hesse <mail@eworm.de>
|
||||
# https://rsc.eworm.de/COPYING.md
|
||||
#
|
||||
# requires RouterOS, version=7.21
|
||||
# requires RouterOS, version=7.22
|
||||
# requires device-mode, hotspot
|
||||
# requires policy, policy=read;write
|
||||
#
|
||||
|
|
@ -12,7 +12,6 @@
|
|||
#
|
||||
# !! Do not edit this file, it is generated from template!
|
||||
|
||||
:local ExitOK false;
|
||||
:onerror Err {
|
||||
:local ScriptName [ :jobname ];
|
||||
|
||||
|
|
@ -25,16 +24,14 @@
|
|||
:if ([ :len [ /interface/wifi/access-list/find where \
|
||||
comment=("hotspot-to-wpa template " . $Hotspot) disabled action="reject" ] ] > 0) do={
|
||||
:log info ($ScriptName . ": Ignoring login for " . $MacAddress . " on hotspot '" . $Hotspot . "'.");
|
||||
:set ExitOK true;
|
||||
:error false;
|
||||
:exit;
|
||||
}
|
||||
|
||||
:local Lease [ /ip/dhcp-server/lease/find where mac-address=$MacAddress address=$Address ];
|
||||
|
||||
:if ([ :len $Lease ] != 1) do={
|
||||
:log warning ($ScriptName . ": Did not find exactly one lease for " . $MacAddress . "!");
|
||||
:set ExitOK true;
|
||||
:error false;
|
||||
:exit;
|
||||
}
|
||||
|
||||
/ip/dhcp-server/lease/set \
|
||||
|
|
@ -48,5 +45,5 @@
|
|||
:delay 1s;
|
||||
/ip/dhcp-server/lease/disable $Lease;
|
||||
} do={
|
||||
:if ($ExitOK = false) do={ :log error ([ :jobname ] . ": " . $Err); }
|
||||
:log error ([ :jobname ] . ": " . $Err);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue