From e37af0065c9e52243ea83780c73029b0ec8acf1c Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 3 Dec 2019 11:41:18 +0100 Subject: hotspot-to-wpa: get limits from place-before-entry --- hotspot-to-wpa | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/hotspot-to-wpa b/hotspot-to-wpa index d1e7cee..bf5ce81 100644 --- a/hotspot-to-wpa +++ b/hotspot-to-wpa @@ -16,5 +16,14 @@ } / caps-man access-list remove [ find where mac-address=$MacAddress comment~"^hotspot-to-wpa: " ]; -/ caps-man access-list add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \ - mac-address=$MacAddress private-passphrase=$PassWord ssid-regexp="-wpa\$" place-before=$PlaceBefore; + +:local Limits [ / caps-man access-list get $PlaceBefore ]; +:if (($Limits->"ap-tx-limit") > 0 && ($Limits->"client-tx-limit") > 0) do={ + / caps-man access-list add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \ + mac-address=$MacAddress private-passphrase=$PassWord ssid-regexp="-wpa\$" \ + ap-tx-limit=($Limits->"ap-tx-limit") client-tx-limit=($Limits->"client-tx-limit") \ + place-before=$PlaceBefore; +} else={ + / caps-man access-list add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \ + mac-address=$MacAddress private-passphrase=$PassWord ssid-regexp="-wpa\$" place-before=$PlaceBefore; +} -- cgit v1.2.3-54-g00ecf