From df07fc8040289a81fcef2114be824a42ab9b8190 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 19 Jun 2022 17:06:02 +0200 Subject: [PATCH] gluon-client-bridge: simplify OWE-TM configuration (#2550) OpenWrt now allows to specify the ifname of the transition interface instead of SSID and BSSID, internally automatically detecting these from interfaces on the same PHY. Thus, these cross-VAP dependant configuration can be omitted from UCI. Signed-off-by: David Bauer --- .../upgrade/320-gluon-client-bridge-wireless | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless index b74af5bf..ff4ca17f 100755 --- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless +++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless @@ -90,21 +90,16 @@ local function configure_owe_transition_mode(config, radio_name) local name_client = 'client_' .. radio_name local name_owe = 'owe_' .. radio_name - local ssid_client = uci:get('wireless', name_client, 'ssid') - local ssid_owe = uci:get('wireless', name_owe, 'ssid') + local ifname_client = uci:get('wireless', name_client, 'ifname') + local ifname_owe = uci:get('wireless', name_owe, 'ifname') - local macaddr_client = uci:get('wireless', name_client, 'macaddr') - local macaddr_owe = uci:get('wireless', name_owe, 'macaddr') - - if not (ssid_client and ssid_owe and macaddr_client and macaddr_owe) then + if not (ifname_client and ifname_owe) then return end - uci:set('wireless', name_client, 'owe_transition_ssid', ssid_owe) - uci:set('wireless', name_client, 'owe_transition_bssid', macaddr_owe) + uci:set('wireless', name_client, 'owe_transition_ifname', ifname_owe) + uci:set('wireless', name_owe, 'owe_transition_ifname', ifname_client) - uci:set('wireless', name_owe, 'owe_transition_ssid', ssid_client) - uci:set('wireless', name_owe, 'owe_transition_bssid', macaddr_client) uci:set('wireless', name_owe, 'hidden', '1') end