[backfire] hostapd: merge r28858

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

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 28d5d20565f3c74b790832e95aadefa0c172a6c1..1ab6c663e573bda96e6138a96a1b341773eec70b 100644 (file)
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -2,6 +2,7 @@ wpa_supplicant_setup_vif() {
        local vif="$1"
        local driver="$2"
        local key="$key"
+       local options="$3"
 
        # wpa_supplicant should use wext for mac80211 cards
        [ "$driver" = "mac80211" ] && driver='wext'
@@ -22,6 +23,15 @@ wpa_supplicant_setup_vif() {
                config_set "$vif" bridge "$bridge"
        }
 
+       local mode ifname wds
+       config_get mode "$vif" mode
+       config_get ifname "$vif" ifname
+       config_get_bool wds "$vif" wds 0
+       [ -z "$bridge" ] || [ "$mode" = ap ] || [ "$mode" = sta -a $wds -eq 1 ] || {
+               echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
+               return 1
+       }
+
        case "$enc" in
                *none*)
                        key_mgmt='NONE'
@@ -76,8 +86,10 @@ wpa_supplicant_setup_vif() {
                                tls)
                                        pairwise='pairwise=CCMP'
                                        group='group=CCMP'
+                                       config_get identity "$vif" identity
                                        config_get priv_key "$vif" priv_key
                                        config_get priv_key_pwd "$vif" priv_key_pwd
+                                       identity="identity=\"$identity\""
                                        priv_key="private_key=\"$priv_key\""
                                        priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
                                ;;
@@ -133,5 +145,5 @@ network={
 }
 EOF
        [ -z "$proto" -a "$key_mgmt" != "NONE" ] || \
-               wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+               wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
 }