From c491c181ea69dc544b49dff66d999f62ebf48619 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Thu, 9 Feb 2017 17:01:44 +0200 Subject: [PATCH] luci-mod-admin-full: add validation to more 802.11r options Apply hexstring datatype to mobility domain and r1_key_holder. Signed-off-by: Hannu Nyman --- modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua index e20dd6cf8..6927da470 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -934,6 +934,7 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then translate("4-character hexadecimal ID")) mobility_domain:depends({ieee80211r="1"}) mobility_domain.placeholder = "4f57" + mobility_domain.datatype = "and(hexstring,rangelength(4,4))" mobility_domain.rmempty = true r0_key_lifetime = s:taboption("encryption", Value, "r0_key_lifetime", @@ -948,6 +949,7 @@ if hwtype == "atheros" or hwtype == "mac80211" or hwtype == "prism2" then translate("6-octet identifier as a hex string - no colons")) r1_key_holder:depends({ieee80211r="1"}) r1_key_holder.placeholder = "00004f577274" + r1_key_holder.datatype = "and(hexstring,rangelength(12,12))" r1_key_holder.rmempty = true reassociation_deadline = s:taboption("encryption", Value, "reassociation_deadline", -- 2.11.0