X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ce140e52cbc4f2b2618f325c2d857d4df2c89510..f3154a2f5101b1241306547c237c41ee80b4a955:/package/hostapd/files/hostapd.sh?ds=inline diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index 147736bdc..4a13c19ab 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -22,7 +22,7 @@ hostapd_setup_vif() { wpa=3 crypto="CCMP TKIP" ;; - *) + *) wpa=1 crypto="TKIP" ;; @@ -39,11 +39,15 @@ hostapd_setup_vif() { case "$enc" in *psk*|*PSK*) config_get psk "$vif" key - append hostapd_cfg "wpa_passphrase=$psk" "$N" + if [ ${#psk} -eq 64 ]; then + append hostapd_cfg "wpa_psk=$psk" "$N" + else + append hostapd_cfg "wpa_passphrase=$psk" "$N" + fi ;; *wpa*|*WPA*) - # required fields? formats? - # hostapd is particular, maybe a default configuration for failures + # required fields? formats? + # hostapd is particular, maybe a default configuration for failures config_get server "$vif" server append hostapd_cfg "auth_server_addr=$server" "$N" config_get port "$vif" port @@ -63,6 +67,7 @@ hostapd_setup_vif() { ;; *) wpa=0 + crypto= ;; esac config_get ifname "$vif" ifname @@ -70,18 +75,90 @@ hostapd_setup_vif() { config_get ssid "$vif" ssid config_get device "$vif" device config_get channel "$device" channel + config_get hwmode "$device" hwmode + config_get wpa_group_rekey "$vif" wpa_group_rekey + config_get ieee80211d "$vif" ieee80211d + config_get_bool wds "$vif" wds 0 + [ "$wds" -gt 0 -a "$driver" = "nl80211" ] && wds="wds_sta=1" || wds="" + case "$hwmode" in + bg) hwmode=g;; + esac + config_get country "$device" country + [ "$channel" = auto ] && channel= + [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" + [ -n "$hwmode" ] && { + config_get hwmode_11n "$device" hwmode_11n + [ -n "$hwmode_11n" ] && { + hwmode="$hwmode_11n" + config_get ht_capab "$device" ht_capab + [ -n "$ht_capab" -a -n "${ht_capab%%\[*}" ] && { + ht_capab=`echo "[$ht_capab]" | sed -e 's, ,][,g'` + } + } + } cat > /var/run/hostapd-$ifname.conf <> /var/run/hostapd-$ifname.conf <