config_get mode "$vif" mode
case "$mode" in
- adhoc|sta|ap)
+ adhoc|ahdemo|sta|ap)
append $mode "$vif"
;;
wds)
case "${adhoc:+1}:${sta:+1}:${ap+1}" in
# valid mode combinations
1::) wds="";;
+ 1::1);;
:1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
:1:);;
::1);;
- :::);;
+ ::);;
*) echo "$device: Invalid mode combination in config"; return 1;;
esac
- config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
+ config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
}
-hostapd_setup_vif() {
- local vif="$1"
- local driver="$2"
- local hostapd_cfg=
-
- # Examples:
- # psk-mixed/tkip => WPA1+2 PSK, TKIP
- # wpa-psk2/tkip+aes => WPA2 PSK, CCMP+TKIP
- # wpa2/tkip+aes => WPA2 RADIUS, CCMP+TKIP
- # ...
-
- # 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*)
- wpa=2
- crypto="CCMP"
- ;;
- *mixed*)
- wpa=3
- crypto="CCMP TKIP"
- ;;
- *)
- wpa=1
- crypto="TKIP"
- ;;
- esac
-
- # explicit override for crypto setting
- case "$enc" in
- *tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
- *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
- append hostapd_cfg "wpa_passphrase=$psk" "$N"
- ;;
- *wpa*|*WPA*)
- # FIXME: add wpa+radius here
- ;;
- *)
- return 0;
- ;;
- esac
- config_get ifname "$vif" ifname
- config_get bridge "$vif" bridge
- config_get ssid "$vif" ssid
- cat > /var/run/hostapd-$ifname.conf <<EOF
-driver=$driver
-interface=$ifname
-${bridge:+bridge=$bridge}
-ssid=$ssid
-debug=0
-wpa=$wpa
-wpa_pairwise=$crypto
-$hostapd_cfg
-EOF
- hostapd -B /var/run/hostapd-$ifname.conf
-}
disable_atheros() (
local device="$1"
config_get vifs "$device" vifs
disable_atheros "$device"
+ local first=1
for vif in $vifs; do
nosbeacon=
config_get ifname "$vif" ifname
}
config_set "$vif" ifname "$ifname"
+ [ "$first" = 1 ] && {
+ # only need to change freq band and channel on the first vif
+ config_get agmode "$device" mode
+ pureg=0
+ case "$agmode" in
+ *b) agmode=11b;;
+ *bg) agmode=11g;;
+ *g) agmode=11g; pureg=1;;
+ *a) agmode=11a;;
+ *) agmode=auto;;
+ esac
+ iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null
+ ifconfig "$ifname" up
+ sleep 1
+ iwpriv "$ifname" mode "$agmode"
+ iwpriv "$ifname" pureg "$pureg"
+ iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
+ }
+
+ config_get_bool hidden "$vif" hidden 0
+ iwpriv "$ifname" hide_ssid "$hidden"
+
+ config_get_bool ff "$vif" ff 0
+ iwpriv "$ifname" ff "$ff"
+
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;
iwconfig "$ifname" enc "[$idx]" "${key:-off}"
done
config_get key "$vif" key
- iwconfig "$ifname" enc "[${key:-1}]"
+ key="${key:-1}"
+ case "$key" in
+ [1234]) iwconfig "$ifname" enc "[$key]";;
+ *) iwconfig "$ifname" enc "$key";;
+ esac
+ ;;
+ PSK|psk|PSK2|psk2)
+ config_get key "$vif" key
;;
esac
config_get addr "$vif" bssid
iwpriv "$ifname" wds_add "$addr"
;;
- *)
- config_get ssid "$vif" ssid
+ adhoc|ahdemo)
+ config_get addr "$vif" bssid
+ [ -z "$addr" ] || {
+ iwconfig "$ifname" ap "$addr"
+ }
;;
esac
- iwconfig "$ifname" channel "$channel"
+ config_get ssid "$vif" ssid
+
+ [ "$mode" = "sta" ] && {
+ config_get_bool bgscan "$vif" bgscan 1
+ iwpriv "$ifname" bgscan "$bgscan"
+ }
+
+ config_get_bool antdiv "$device" diversity 1
+ sysctl -w dev."$device".diversity="$antdiv" >&-
+
+ config_get antrx "$device" rxantenna
+ if [ -n "$antrx" ]; then
+ sysctl -w dev."$device".rxantenna="$antrx" >&-
+ fi
+
+ config_get anttx "$device" txantenna
+ if [ -n "$anttx" ]; then
+ sysctl -w dev."$device".txantenna="$anttx" >&-
+ fi
+
+ config_get distance "$device" distance
+ if [ -n "$distance" ]; then
+ athctrl -i "$device" -d "$distance" >&-
+ fi
+
+ config_get txpwr "$vif" txpower
+ if [ -n "$txpwr" ]; then
+ iwconfig "$ifname" txpower "${txpwr%%.*}"
+ fi
+
+ config_get frag "$vif" frag
+ if [ -n "$frag" ]; then
+ iwconfig "$ifname" frag "${frag%%.*}"
+ fi
+
+ config_get rts "$vif" rts
+ if [ -n "$rts" ]; then
+ iwconfig "$ifname" rts "${rts%%.*}"
+ fi
+
ifconfig "$ifname" up
-
+ iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
+
local net_cfg bridge
net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
config_set "$vif" bridge "$bridge"
start_net "$ifname" "$net_cfg"
}
+ iwconfig "$ifname" essid "$ssid"
case "$mode" in
ap)
- hostapd_setup_vif "$vif" madwifi || {
- echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
- # make sure this wifi interface won't accidentally stay open without encryption
- ifconfig "$ifname" down
- wlanconfig "$ifname" destroy
- continue
- }
+ config_get_bool isolate "$vif" isolate 0
+ iwpriv "$ifname" ap_bridge "$((isolate^1))"
+
+ if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+ hostapd_setup_vif "$vif" madwifi || {
+ echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
+ # make sure this wifi interface won't accidentally stay open without encryption
+ ifconfig "$ifname" down
+ wlanconfig "$ifname" destroy
+ continue
+ }
+ fi
;;
wds|sta)
- iwconfig "$ifname" essid "$ssid"
- # FIXME: implement wpa_supplicant calls here
+ case "$enc" in
+ PSK|psk|PSK2|psk2)
+ case "$enc" in
+ PSK|psk)
+ proto='proto=WPA';;
+ PSK2|psk2)
+ proto='proto=RSN';;
+ esac
+ cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
+ctrl_interface=/var/run/wpa_supplicant
+network={
+ scan_ssid=1
+ ssid="$ssid"
+ key_mgmt=WPA-PSK
+ $proto
+ psk="$key"
+}
+EOF
+ ;;
+ WPA|wpa|WPA2|wpa2)
+ #add wpa_supplicant calls here
+ ;;
+ esac
+ [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -Bw -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
;;
esac
+ first=0
done
}
detect_atheros() {
cd /proc/sys/dev
[ -d ath ] || return
- for dev in wifi*; do
+ for dev in $(ls -d wifi* 2>&-); do
config_get type "$dev" type
[ "$type" = atheros ] && return
cat <<EOF
option type atheros
option channel 5
+ # REMOVE THIS LINE TO ENABLE WIFI:
+ option disabled 1
+
config wifi-iface
- option device $dev
-# option network lan
- option mode ap
- option ssid OpenWrt
- option hidden 0
+ option device $dev
+ option network lan
+ option mode ap
+ option ssid OpenWrt
option encryption none
-
EOF
done
}
-
projects / openwrt.git / blobdiff