2e0f41e73a
Cherry-pick Multi-AP commits from uptream: 9c06f0f6a hostapd: Add Multi-AP protocol support 5abc7823b wpa_supplicant: Add Multi-AP backhaul STA support a1debd338 tests: Refactor test_multi_ap bfcdac1c8 Multi-AP: Don't reject backhaul STA on fronthaul BSS cb3c156e7 tests: Update multi_ap_fronthaul_on_ap to match implementation 56a2d788f WPS: Add multi_ap_subelem to wps_build_wfa_ext() 83ebf5586 wpa_supplicant: Support Multi-AP backhaul STA onboarding with WPS 66819b07b hostapd: Support Multi-AP backhaul STA onboarding with WPS 8682f384c hostapd: Add README-MULTI-AP b1daf498a tests: Multi-AP WPS provisioning Add support for Multi-AP to the UCI configuration. Every wifi-iface gets an option 'multi_ap'. For APs, its value can be 0 (multi-AP support disabled), 1 (backhaul AP), 2 (fronthaul AP), or 3 (fronthaul + backhaul AP). For STAs, it can be 0 (not a backhaul STA) or 1 (backhaul STA, can only associate with backhaul AP). Also add new optional parameter to wps_start ubus call of wpa_supplicant to indicate that a Multi-AP backhaul link is required. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
63 lines
1.7 KiB
Bash
63 lines
1.7 KiB
Bash
#!/bin/sh
|
|
|
|
wps_catch_credentials() {
|
|
local iface ifaces ifc ifname ssid encryption key radio radios
|
|
local found=0
|
|
|
|
. /usr/share/libubox/jshn.sh
|
|
ubus -S -t 30 listen wps_credentials | while read creds; do
|
|
json_init
|
|
json_load "$creds"
|
|
json_select wps_credentials || continue
|
|
json_get_vars ifname ssid key encryption
|
|
local ifcname="$ifname"
|
|
json_init
|
|
json_load "$(ubus -S call network.wireless status)"
|
|
json_get_keys radios
|
|
for radio in $radios; do
|
|
json_select $radio
|
|
json_select interfaces
|
|
json_get_keys ifaces
|
|
for ifc in $ifaces; do
|
|
json_select $ifc
|
|
json_get_vars ifname
|
|
[ "$ifname" = "$ifcname" ] && {
|
|
ubus -S call uci set "{\"config\":\"wireless\", \"type\":\"wifi-iface\", \
|
|
\"match\": { \"device\": \"$radio\", \"encryption\": \"wps\" }, \
|
|
\"values\": { \"encryption\": \"$encryption\", \
|
|
\"ssid\": \"$ssid\", \
|
|
\"key\": \"$key\" } }"
|
|
ubus -S call uci commit '{"config": "wireless"}'
|
|
ubus -S call uci apply
|
|
}
|
|
json_select ..
|
|
done
|
|
json_select ..
|
|
json_select ..
|
|
done
|
|
done
|
|
}
|
|
|
|
if [ "$ACTION" = "pressed" -a "$BUTTON" = "wps" ]; then
|
|
wps_done=0
|
|
ubusobjs="$( ubus -S list hostapd.* )"
|
|
for ubusobj in $ubusobjs; do
|
|
ubus -S call $ubusobj wps_start && wps_done=1
|
|
done
|
|
[ $wps_done = 0 ] || return 0
|
|
wps_done=0
|
|
ubusobjs="$( ubus -S list wpa_supplicant.* )"
|
|
for ubusobj in $ubusobjs; do
|
|
ifname="$(echo $ubusobj | cut -d'.' -f2 )"
|
|
multi_ap=""
|
|
if [ -e "/var/run/wpa_supplicant-${ifname}.conf.is_multiap" ]; then
|
|
ubus -S call $ubusobj wps_start '{ "multi_ap": true }' && wps_done=1
|
|
else
|
|
ubus -S call $ubusobj wps_start && wps_done=1
|
|
fi
|
|
done
|
|
[ $wps_done = 0 ] || wps_catch_credentials &
|
|
fi
|
|
|
|
return 0
|