From 532b57011fac699db2dc4773f7622cb3ba82c254 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 17 Mar 2018 15:38:24 +0100 Subject: [PATCH] gluon-core, gluon-client-bridge: allow 0-character ESSIDs/mesh IDs --- package/gluon-client-bridge/check_site.lua | 2 +- package/gluon-core/check_site.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gluon-client-bridge/check_site.lua b/package/gluon-client-bridge/check_site.lua index ea733a95..7922fae5 100644 --- a/package/gluon-client-bridge/check_site.lua +++ b/package/gluon-client-bridge/check_site.lua @@ -9,7 +9,7 @@ need_string_match(in_domain({'next_node', 'ip6'}), '^[%x:]+$', false) for _, config in ipairs({'wifi24', 'wifi5'}) do if need_table({config, 'ap'}, nil, false) then - need_string_match(in_domain({config, 'ap', 'ssid'}), '^.' .. ('.?'):rep(31) .. '$') + need_string_match(in_domain({config, 'ap', 'ssid'}), '^' .. ('.?'):rep(32) .. '$') need_boolean({config, 'ap', 'disabled'}, false) end end diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua index ab4c5358..e2f2e69b 100644 --- a/package/gluon-core/check_site.lua +++ b/package/gluon-core/check_site.lua @@ -48,7 +48,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do need_array_of({config, 'basic_rate'}, supported_rates or rates, supported_rates ~= nil) if need_table({config, 'ibss'}, nil, false) then - need_string_match(in_domain({config, 'ibss', 'ssid'}), '^.' .. ('.?'):rep(31) .. '$') + need_string_match(in_domain({config, 'ibss', 'ssid'}), '^' .. ('.?'):rep(32) .. '$') need_string_match(in_domain({config, 'ibss', 'bssid'}), '^%x[02468aAcCeE]:%x%x:%x%x:%x%x:%x%x:%x%x$') need_one_of({config, 'ibss', 'mcast_rate'}, supported_rates or rates, false) need_number({config, 'ibss', 'vlan'}, false) @@ -56,7 +56,7 @@ for _, config in ipairs({'wifi24', 'wifi5'}) do end if need_table({config, 'mesh'}, nil, false) then - need_string_match(in_domain({config, 'mesh', 'id'}), '^.' .. ('.?'):rep(31) .. '$') + need_string_match(in_domain({config, 'mesh', 'id'}), '^' .. ('.?'):rep(32) .. '$') need_one_of({config, 'mesh', 'mcast_rate'}, supported_rates or rates, false) need_boolean({config, 'mesh', 'disabled'}, false) end