From 81280d8e186e09f6205a014a12a71495efc6830c Mon Sep 17 00:00:00 2001
From: kb-light <freifunk@kb-light.de>
Date: Wed, 3 Aug 2016 11:03:44 +0200
Subject: [PATCH] gluon-mesh-batman-adv-core: use need_one_of() to check for
valid mcast_rate
---
package/gluon-mesh-batman-adv-core/check_site.lua | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/package/gluon-mesh-batman-adv-core/check_site.lua b/package/gluon-mesh-batman-adv-core/check_site.lua
index 197748718..07bf9a0a2 100644
--- a/package/gluon-mesh-batman-adv-core/check_site.lua
+++ b/package/gluon-mesh-batman-adv-core/check_site.lua
@@ -1,15 +1,18 @@
for _, config in ipairs({'wifi24', 'wifi5'}) do
+ local rates = {1000, 2000, 5500, 6000, 9000, 11000, 12000, 18000, 24000, 36000, 48000, 54000}
+ rates = need_array_of(config .. '.supported_rates', rates, false) or rates
+
if need_table(config .. '.ibss', nil, false) then
need_string(config .. '.ibss.ssid')
need_string_match(config .. '.ibss.bssid', '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$')
- need_number(config .. '.ibss.mcast_rate', false)
+ need_one_of(config .. '.ibss.mcast_rate', rates, false)
need_number(config .. '.ibss.vlan', false)
need_boolean(config .. '.ibss.disabled', false)
end
if need_table(config .. '.mesh', nil, false) then
need_string(config .. '.mesh.id')
- need_number(config .. '.mesh.mcast_rate', false)
+ need_one_of(config .. '.mesh.mcast_rate', rates, false)
need_boolean(config .. '.mesh.disabled', false)
end
end
--
GitLab