mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-03 01:31:53 +02:00
c0a4b957c5
Since client mode in mac80211is unreliable without using wpa_supplicant, it would be better to enable wpa_supplicant by default. With this patch, wpa_supplicant will always be used for mac80211-based drivers in client mode. This will break client mode for images that don't include wpa_supplicant or wpad, so maybe I need to add a check somewhere to see if wpa_supplicant is available, and show the user a warning if he tries client mode without wpa_supplicant. Suggestions on where to add this check are welcome. Tested with ath5k in client mode on open and wpa2-psk network, and tested on my ath9k based AP as well to make sure it doesn't break AP mode. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19718 3c298f89-4303-0410-b956-a3cf2f4a3e73
124 lines
2.8 KiB
Bash
124 lines
2.8 KiB
Bash
wpa_supplicant_setup_vif() {
|
|
local vif="$1"
|
|
local driver="$2"
|
|
local key="$key"
|
|
|
|
# wpa_supplicant should use wext for mac80211 cards
|
|
[ "$driver" = "mac80211" ] && driver='wext'
|
|
|
|
# make sure we have the encryption type and the psk
|
|
[ -n "$enc" ] || {
|
|
config_get enc "$vif" encryption
|
|
}
|
|
[ -n "$key" ] || {
|
|
config_get key "$vif" key
|
|
}
|
|
|
|
case "$enc" in
|
|
*none*)
|
|
key_mgmt='NONE'
|
|
;;
|
|
*wep*)
|
|
key_mgmt='NONE'
|
|
config_get key "$vif" key
|
|
key="${key:-1}"
|
|
case "$key" in
|
|
[1234])
|
|
for idx in 1 2 3 4; do
|
|
local zidx
|
|
zidx=$(($idx - 1))
|
|
config_get ckey "$vif" "key${idx}"
|
|
[ -n "$ckey" ] && \
|
|
append "wep_key${zidx}" "wep_key${zidx}=$(prepare_key_wep "$ckey")"
|
|
done
|
|
wep_tx_keyidx="wep_tx_keyidx=$((key - 1))"
|
|
;;
|
|
*)
|
|
wep_key0="wep_key0=$(prepare_key_wep "$key")"
|
|
wep_tx_keyidx="wep_tx_keyidx=0"
|
|
;;
|
|
esac
|
|
;;
|
|
*psk*)
|
|
key_mgmt='WPA-PSK'
|
|
config_get_bool usepassphrase "$vif" passphrase 1
|
|
case "$enc" in
|
|
*psk2*)
|
|
proto='proto=RSN'
|
|
if [ "$usepassphrase" = "1" ]; then
|
|
passphrase="psk=\"${key}\""
|
|
else
|
|
passphrase="psk=${key}"
|
|
fi
|
|
;;
|
|
*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'
|
|
config_get ca_cert "$vif" ca_cert
|
|
ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
|
|
case "$eap_type" in
|
|
tls)
|
|
pairwise='pairwise=CCMP'
|
|
group='group=CCMP'
|
|
config_get priv_key "$vif" priv_key
|
|
config_get priv_key_pwd "$vif" priv_key_pwd
|
|
priv_key="private_key=\"$priv_key\""
|
|
priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
|
|
;;
|
|
peap|ttls)
|
|
config_get auth "$vif" auth
|
|
config_get identity "$vif" identity
|
|
config_get password "$vif" password
|
|
phase2="phase2=\"auth=${auth:-MSCHAPV2}\""
|
|
identity="identity=\"$identity\""
|
|
password="password=\"$password\""
|
|
;;
|
|
esac
|
|
eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
|
|
;;
|
|
esac
|
|
config_get ifname "$vif" ifname
|
|
config_get bridge "$vif" bridge
|
|
config_get ssid "$vif" ssid
|
|
config_get bssid "$vif" bssid
|
|
bssid=${bssid:+"bssid=$bssid"}
|
|
rm -rf /var/run/wpa_supplicant-$ifname
|
|
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
|
|
ctrl_interface=/var/run/wpa_supplicant-$ifname
|
|
network={
|
|
scan_ssid=1
|
|
ssid="$ssid"
|
|
$bssid
|
|
key_mgmt=$key_mgmt
|
|
$proto
|
|
$passphrase
|
|
$pairwise
|
|
$group
|
|
$eap_type
|
|
$ca_cert
|
|
$priv_key
|
|
$priv_key_pwd
|
|
$phase2
|
|
$identity
|
|
$password
|
|
$wep_key0
|
|
$wep_key1
|
|
$wep_key2
|
|
$wep_key3
|
|
$wep_tx_keyidx
|
|
}
|
|
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
|
|
}
|