projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostapd: do not restrict ht capabilities for ap+sta
[openwrt.git]
/
package
/
hostapd
/
files
/
wpa_supplicant.sh
diff --git
a/package/hostapd/files/wpa_supplicant.sh
b/package/hostapd/files/wpa_supplicant.sh
index 8f7f503c1fcfd7870d6a6cc6dfaf17376a8e0e63..515fa6c0da3d8d645cd5ef234d1cfa93c3838144 100644
(file)
--- a/
package/hostapd/files/wpa_supplicant.sh
+++ b/
package/hostapd/files/wpa_supplicant.sh
@@
-2,16
+2,31
@@
wpa_supplicant_setup_vif() {
local vif="$1"
local driver="$2"
local key="$key"
local vif="$1"
local driver="$2"
local key="$key"
+ local options="$3"
# wpa_supplicant should use wext for mac80211 cards
[ "$driver" = "mac80211" ] && driver='wext'
# wpa_supplicant should use wext for mac80211 cards
[ "$driver" = "mac80211" ] && driver='wext'
- # make sure we have the psk
+ # make sure we have the encryption type and the psk
+ [ -n "$enc" ] || {
+ config_get enc "$vif" encryption
+ }
[ -n "$key" ] || {
config_get key "$vif" key
}
[ -n "$key" ] || {
config_get key "$vif" key
}
+ local net_cfg bridge
+ config_get bridge "$vif" bridge
+ [ -z "$bridge" ] && {
+ net_cfg="$(find_net_config "$vif")"
+ [ -z "$net_cfg" ] || bridge="$(bridge_interface "$net_cfg")"
+ config_set "$vif" bridge "$bridge"
+ }
+
case "$enc" in
case "$enc" in
+ *none*)
+ key_mgmt='NONE'
+ ;;
*wep*)
key_mgmt='NONE'
config_get key "$vif" key
*wep*)
key_mgmt='NONE'
config_get key "$vif" key
@@
-36,29
+51,27
@@
wpa_supplicant_setup_vif() {
*psk*)
key_mgmt='WPA-PSK'
config_get_bool usepassphrase "$vif" passphrase 1
*psk*)
key_mgmt='WPA-PSK'
config_get_bool usepassphrase "$vif" passphrase 1
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
case "$enc" in
*psk2*)
proto='proto=RSN'
case "$enc" in
*psk2*)
proto='proto=RSN'
- if [ "$usepassphrase" = "1" ]; then
- passphrase="psk=\"${key}\""
- else
- passphrase="psk=${key}"
- fi
+ config_get ieee80211w "$vif" ieee80211w
;;
*psk*)
proto='proto=WPA'
;;
*psk*)
proto='proto=WPA'
- if [ "$usepassphrase" = "1" ]; then
- passphrase="psk=\"${key}\""
- else
- passphrase="psk=${key}"
- fi
;;
esac
;;
*wpa*|*8021x*)
proto='proto=WPA2'
key_mgmt='WPA-EAP'
;;
esac
;;
*wpa*|*8021x*)
proto='proto=WPA2'
key_mgmt='WPA-EAP'
+ config_get ieee80211w "$vif" ieee80211w
config_get ca_cert "$vif" ca_cert
config_get ca_cert "$vif" ca_cert
+ config_get eap_type "$vif" eap_type
ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
case "$eap_type" in
tls)
ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
case "$eap_type" in
tls)
@@
-81,6
+94,13
@@
wpa_supplicant_setup_vif() {
eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
;;
esac
eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
;;
esac
+
+ case "$ieee80211w" in
+ [012])
+ ieee80211w="ieee80211w=$ieee80211w"
+ ;;
+ esac
+
config_get ifname "$vif" ifname
config_get bridge "$vif" bridge
config_get ssid "$vif" ssid
config_get ifname "$vif" ifname
config_get bridge "$vif" bridge
config_get ssid "$vif" ssid
@@
-95,6
+115,7
@@
network={
$bssid
key_mgmt=$key_mgmt
$proto
$bssid
key_mgmt=$key_mgmt
$proto
+ $ieee80211w
$passphrase
$pairwise
$group
$passphrase
$pairwise
$group
@@
-113,5
+134,5
@@
network={
}
EOF
[ -z "$proto" -a "$key_mgmt" != "NONE" ] || \
}
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
}
}