hi!
This makes wpa_supplicant.conf getting generated according to the comment
about IBSS mode in
http://hostap.epitest.fi/cgi-bin/viewcvs.cgi/hostap/wpa_supplicant/wpa_supplicant.conf?revision=HEAD
To get this working with madwifi, I had to modify madwifi.sh as well so that
wpa_supplicant gets fired up.
comments are welcome!
cheers
Daniel
---
Index: package/hostapd/files/wpa_supplicant.sh
===================================================================
--- package/hostapd/files/wpa_supplicant.sh (revision 23434)
+++ package/hostapd/files/wpa_supplicant.sh (working copy)
@@ -48,21 +48,41 @@
esac
;;
*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'
- config_get ieee80211w "$vif" ieee80211w
- ;;
- *psk*)
+ config_get vifmode "$vif" mode
+ case "$vifmode" in
+ adhoc)
+ key_mgmt='WPA-NONE'
+ pairwise='pairwise=NONE'
proto='proto=WPA'
+ ap_scan='ap_scan=2'
+ mode='mode=1'
+ case "$enc" in
+ *psk2*|*ccmp*|*aes*)
+ group='group=CCMP'
+ ;;
+ *psk*|*tkip*)
+ group='group=TKIP'
+ ;;
+ esac
;;
+ *)
+ key_mgmt='WPA-PSK'
+ case "$enc" in
+ *psk2*)
+ proto='proto=RSN'
+ config_get ieee80211w
"$vif" ieee80211w
+ ;;
+ *psk*)
+ proto='proto=WPA'
+ ;;
+ esac
+ ;;
esac
;;
*wpa*|*8021x*)
@@ -108,9 +128,11 @@
rm -rf /var/run/wpa_supplicant-$ifname
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant-$ifname
+$ap_scan
network={
scan_ssid=1
ssid="$ssid"
+ $mode
$bssid
key_mgmt=$key_mgmt
$proto
Index: package/madwifi/files/lib/wifi/madwifi.sh
===================================================================
--- package/madwifi/files/lib/wifi/madwifi.sh (revision 23434)
+++ package/madwifi/files/lib/wifi/madwifi.sh (working copy)
@@ -356,8 +356,8 @@
}
fi
;;
- wds|sta)
- if eval "type wpa_supplicant_setup_vif"
2>/dev/null >/dev/null; then
+ wds|sta|adhoc)
+ if [ -n "$start_hostapd" ] && eval "type
wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
wpa_supplicant_setup_vif "$vif" madwifi
|| {
echo "enable_atheros($device):
Failed to set up wpa_supplicant for interface $ifname" >&2
ifconfig "$ifname" down
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
