X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2eb1c2d1df2f93d1722ddee225a21561c689f689..8ffdced268ca56286dd722543f3b475c73dfca4c:/package/hostapd/files/hostapd.sh?ds=inline diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index 9ee7657e2..bc58b88f9 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -1,10 +1,18 @@ 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 + config_get_bool ap_isolate "$vif" isolate 0 + + config_get device "$vif" device + config_get hwmode "$device" hwmode + + if [ "$ap_isolate" -gt 0 ]; then + append "$var" "ap_isolate=$ap_isolate" "$N" + fi # Examples: # psk-mixed/tkip => WPA1+2 PSK, TKIP @@ -33,11 +41,16 @@ hostapd_set_bss_options() { # explicit override for crypto setting case "$enc" in - *tkip+aes|*tkip+ccmp) crypto="CCMP TKIP";; + *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";; *aes|*ccmp) crypto="CCMP";; *tkip) crypto="TKIP";; esac + # enforce CCMP for 11ng and 11na + case "$hwmode" in + *ng|*na) crypto="CCMP";; + esac + # use crypto/auth settings for building the hostapd config case "$enc" in *psk*) @@ -47,6 +60,7 @@ hostapd_set_bss_options() { else append "$var" "wpa_passphrase=$psk" "$N" fi + wps_possible=1 ;; *wpa*) # required fields? formats? @@ -68,6 +82,28 @@ hostapd_set_bss_options() { append "$var" "wpa_group_rekey=300" "$N" append "$var" "wpa_gmk_rekey=640" "$N" ;; + *wep*) + config_get key "$vif" key + key="${key:-1}" + case "$key" in + [1234]) + for idx in 1 2 3 4; do + local zidx + zidx=$(($idx - 1)) + config_get ckey "$vif" "key${idx}" + [ -n "$ckey" ] && \ + append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N" + done + append "$var" "wep_default_key=$((key - 1))" "$N" + ;; + *) + append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N" + append "$var" "wep_default_key=0" "$N" + ;; + esac + wpa=0 + crypto= + ;; *) wpa=0 crypto= @@ -80,10 +116,35 @@ 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 + [012]) + append "$var" "ieee80211w=$ieee80211w" "$N" + [ "$ieee80211w" -gt "0" ] && { + config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout + config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout + [ -n "$ieee80211w_max_timeout" ] && \ + append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N" + [ -n "$ieee80211w_retry_timeout" ] && \ + append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N" + } + ;; + esac } hostapd_setup_vif() { @@ -97,7 +158,8 @@ hostapd_setup_vif() { config_get channel "$device" channel config_get hwmode "$device" hwmode case "$hwmode" in - bg) hwmode=g;; + *bg|*gdt|*gst|*fh) hwmode=g;; + *adt|*ast) hwmode=a;; esac [ "$channel" = auto ] && channel= [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" @@ -105,7 +167,7 @@ hostapd_setup_vif() { ctrl_interface=/var/run/hostapd-$ifname driver=$driver interface=$ifname -${hwmode:+hw_mode=$hwmode} +${hwmode:+hw_mode=${hwmode#11}} ${channel:+channel=$channel} $hostapd_cfg EOF