X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ce140e52cbc4f2b2618f325c2d857d4df2c89510..9e97fe261db0c03effd31865eea9f8759a4f2f16:/package/hostapd/files/hostapd.sh?ds=inline diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index 147736bdc..a2f2d6fd1 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -39,7 +39,11 @@ 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? @@ -63,6 +67,7 @@ hostapd_setup_vif() { ;; *) wpa=0 + crypto= ;; esac config_get ifname "$vif" ifname @@ -70,18 +75,29 @@ hostapd_setup_vif() { config_get ssid "$vif" ssid config_get device "$vif" device config_get channel "$device" channel + config_get hwmode "$device" hwmode + case "$hwmode" in + 11a) hwmode=a;; + 11b) hwmode=b;; + 11g) hwmode=g;; + *) + hwmode= + [ "$channel" -gt 14 ] && hwmode=a + ;; + esac cat > /var/run/hostapd-$ifname.conf <