[package] add additions from (#5149)

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

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 529462e..876930d 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -11,7 +11,7 @@ hostapd_setup_vif() {
 
        # TODO: move this parsing function somewhere generic, so that
        # later it can be reused by drivers that don't use hostapd
 
        # TODO: move this parsing function somewhere generic, so that
        # later it can be reused by drivers that don't use hostapd

-       
+

        # crypto defaults: WPA2 vs WPA1
        case "$enc" in
                wpa2*|WPA2*|*PSK2*|*psk2*)
        # crypto defaults: WPA2 vs WPA1
        case "$enc" in
                wpa2*|WPA2*|*PSK2*|*psk2*)


@@ -22,7 +22,7 @@ hostapd_setup_vif() {
                        wpa=3
                        crypto="CCMP TKIP"
                ;;
                        wpa=3
                        crypto="CCMP TKIP"
                ;;

-               *) 
+               *)

                        wpa=1
                        crypto="TKIP"
                ;;
                        wpa=1
                        crypto="TKIP"
                ;;


@@ -34,33 +34,80 @@ hostapd_setup_vif() {
                *tkip|*TKIP) crypto="TKIP";;
                *aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
        esac
                *tkip|*TKIP) crypto="TKIP";;
                *aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
        esac

-       
+

        # use crypto/auth settings for building the hostapd config
        case "$enc" in
                *psk*|*PSK*)
                        config_get psk "$vif" key
        # use crypto/auth settings for building the hostapd config
        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*)
                ;;
                *wpa*|*WPA*)

-               # FIXME: add wpa+radius here
+                       # 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
+                       port=${port:-1812}
+                       append hostapd_cfg "auth_server_port=$port" "$N"
+                       config_get secret "$vif" key
+                       append hostapd_cfg "auth_server_shared_secret=$secret" "$N"
+                       config_get nasid "$vif" nasid
+                       append hostapd_cfg "nas_identifier=$nasid" "$N"
+                       append hostapd_cfg "eapol_key_index_workaround=1" "$N"
+                       append hostapd_cfg "radius_acct_interim_interval=300" "$N"
+                       append hostapd_cfg "ieee8021x=1" "$N"
+                       append hostapd_cfg "auth_algs=1" "$N"
+                       append hostapd_cfg "wpa_key_mgmt=WPA-EAP" "$N"
+                       append hostapd_cfg "wpa_group_rekey=300" "$N"
+                       append hostapd_cfg "wpa_gmk_rekey=640" "$N"

                ;;
                *)
                ;;
                *)

-                       return 0;
+                       wpa=0
+                       crypto=

                ;;
        esac
        config_get ifname "$vif" ifname
        config_get bridge "$vif" bridge
        config_get ssid "$vif" ssid
                ;;
        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
+       config_get wpa_group_rekey "$vif" wpa_group_rekey
+       config_get ieee80211d "$vif" ieee80211d 
+       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
+               }
+       }

        cat > /var/run/hostapd-$ifname.conf <<EOF
        cat > /var/run/hostapd-$ifname.conf <<EOF

+ctrl_interface=/var/run/hostapd-$ifname

 driver=$driver
 interface=$ifname
 driver=$driver
 interface=$ifname

+${hwmode:+hw_mode=$hwmode}
+${channel:+channel=$channel}

 ${bridge:+bridge=$bridge}
 ssid=$ssid
 ${bridge:+bridge=$bridge}
 ssid=$ssid

-debug=0

 wpa=$wpa
 wpa=$wpa

-wpa_pairwise=$crypto
+${crypto:+wpa_pairwise=$crypto}
+${country:+country_code=$country}
+${hwmode_11n:+ieee80211n=1}
+${ht_capab:+ht_capab=$ht_capab}
+${wpa_group_rekey:+wpa_group_rekey=$wpa_group_rekey}
+${ieee80211d:+ieee80211d=$ieee80211d}

 $hostapd_cfg
 EOF
 $hostapd_cfg
 EOF

-       hostapd -B /var/run/hostapd-$ifname.conf
+       hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf

 }
 
 }