hostapd/mac80211: implement support for AP+STA

[openwrt.git] / package / hostapd / files / hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index fdb047be6a76518f058fc014a8d4d6ce4e229585..bc58b88f9eace5177d5a30b56679fd17bb2683bd 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -1,7 +1,7 @@
 hostapd_set_bss_options() {
        local var="$1"
        local vif="$2"
-       local enc wpa_group_rekey
+       local enc wpa_group_rekey wps_possible
 
        config_get enc "$vif" encryption
        config_get wpa_group_rekey "$vif" wpa_group_rekey
@@ -60,6 +60,7 @@ hostapd_set_bss_options() {
                        else
                                append "$var" "wpa_passphrase=$psk" "$N"
                        fi
+                       wps_possible=1
                ;;
                *wpa*)
                        # required fields? formats?
@@ -115,10 +116,20 @@ hostapd_set_bss_options() {
        config_get ssid "$vif" ssid
        config_get bridge "$vif" bridge
        config_get ieee80211d "$vif" ieee80211d
+       config_get iapp_interface "$vif" iapp_interface
+
+       config_get_bool wps_pbc "$vif" wps_pushbutton 0
+       [ -n "$wps_possible" -a "$wps_pbc" -gt 0 ] && {
+               append "$var" "eap_server=1" "$N"
+               append "$var" "wps_state=2" "$N"
+               append "$var" "ap_setup_locked=1" "$N"
+               append "$var" "config_methods=push_button" "$N"
+       }
 
        append "$var" "ssid=$ssid" "$N"
        [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
        [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
+       [ -n "$iapp_interface" ] && append "$var" $(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N"
 
        [ "$wpa" -ge "2" ] && config_get ieee80211w "$vif" ieee80211w
        case "$ieee80211w" in