[package] hostapd,madwifi: rename agmode option to hwmode. 11a and 11g aren't the...

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 660a90c3efaed7b446ded279207a612285f22ded..1c2fa35e7a115421cbd0edafe866740e644d5aa9 100644 (file)
--- 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?
@@ -62,15 +66,29 @@ hostapd_setup_vif() {
                        append hostapd_cfg "wpa_gmk_rekey=640" "$N"
                ;;
                *)
-                       return 0;
+                       wpa=0
                ;;
        esac
        config_get ifname "$vif" ifname
        config_get bridge "$vif" bridge
        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 <<EOF
 driver=$driver
 interface=$ifname
+hw_mode=${hwmode:-g}
+channel=$channel
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
@@ -78,6 +96,6 @@ wpa=$wpa
 wpa_pairwise=$crypto
 $hostapd_cfg
 EOF
-       hostapd -B /var/run/hostapd-$ifname.conf
+       hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
 }