config_get mode "$vif" mode
case "$mode" in
- adhoc|sta|ap)
+ adhoc|ahdemo|sta|ap|monitor)
append $mode "$vif"
;;
wds)
- config_get addr "$vif" bssid
config_get ssid "$vif" ssid
- [ -z "$addr" -a -n "$ssid" ] && {
- config_set "$vif" wds 1
- config_set "$vif" mode sta
- mode="sta"
- addr="$ssid"
- }
+ [ -z "$ssid" ] && continue
+
+ config_set "$vif" wds 1
+ config_set "$vif" mode sta
+ mode="sta"
+ addr="$ssid"
${addr:+append $mode "$vif"}
;;
*) echo "$device($vif): Invalid mode, ignored."; continue;;
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 }${monitor:+$monitor}"
}
disable_atheros() (
local device="$1"
+ set_wifi_down "$device"
# kill all running hostapd and wpa_supplicant processes that
# are running on atheros vifs
for pid in `pidof hostapd wpa_supplicant`; do
)
enable_atheros() {
+ local device="$1"
config_get channel "$device" channel
config_get vifs "$device" vifs
-
- disable_atheros "$device"
+
+ [ auto = "$channel" ] && channel=0
+
local first=1
for vif in $vifs; do
nosbeacon=
[ "$first" = 1 ] && {
# only need to change freq band and channel on the first vif
- config_get agmode "$device" mode
+ config_get agmode "$device" agmode
+ [ -z "$agmode" ] && config_get agmode "$device" mode
+
pureg=0
case "$agmode" in
*b) agmode=11b;;
*a) agmode=11a;;
*) agmode=auto;;
esac
- iwconfig "$ifname" channel 0 >/dev/null 2>/dev/null
- ifconfig "$ifname" up
iwpriv "$ifname" mode "$agmode"
iwpriv "$ifname" pureg "$pureg"
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
}
- config_get_bool hidden "$vif" hidden
+ config_get_bool hidden "$vif" hidden 0
iwpriv "$ifname" hide_ssid "$hidden"
+ config_get ff "$vif" ff
+ if [ -n "$ff" ]; then
+ iwpriv "$ifname" ff "$ff"
+ fi
+
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;
esac
iwpriv "$ifname" wds "$wds"
+ [ "$mode" = ap -a "$wds" = 1 ] && {
+ config_get_bool wdssep "$vif" wdssep 1
+ [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+ }
+
wpa=
case "$enc" in
WEP|wep)
esac
case "$mode" in
- wds)
- config_get addr "$vif" bssid
- iwpriv "$ifname" wds_add "$addr"
- ;;
- *)
- config_get ssid "$vif" ssid
- ;;
- adhoc)
+ adhoc|ahdemo)
config_get addr "$vif" bssid
[ -z "$addr" ] || {
iwconfig "$ifname" ap "$addr"
}
;;
esac
+ config_get ssid "$vif" ssid
- [ "$mode" = "sta" ] && {
- config_get_bool bgscan "$vif" bgscan 1
- iwpriv "$ifname" bgscan "$bgscan"
- }
+ config_get_bool bgscan "$vif" bgscan
+ [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan"
- config_get_bool antdiv "$device" diversity 1
- sysctl -w dev."$device".diversity="$antdiv" >&-
+ config_get_bool antdiv "$device" diversity
+ [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&-
config_get antrx "$device" rxantenna
- if [ -n "$antrx" ]; then
- sysctl -w dev."$device".rxantenna="$antrx" >&-
- fi
+ [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&-
config_get anttx "$device" txantenna
- if [ -n "$anttx" ]; then
- sysctl -w dev."$device".txantenna="$anttx" >&-
- fi
+ [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&-
config_get distance "$device" distance
- if [ -n "$distance" ]; then
- athctrl -i "$device" -d "$distance" >&-
- fi
+ [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
config_get txpwr "$vif" txpower
- if [ -n "$txpwr" ]; then
- iwconfig "$ifname" txpower "${txpwr%%.*}"
- fi
+ [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
- ifconfig "$ifname" up
- iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
+ config_get rate "$vif" rate
+ [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
+
+ config_get mcast_rate "$vif" mcast_rate
+ [ -n "$mcast_rate" ] && iwpriv "$ifname" mcast_rate "${mcast_rate%%.*}"
+ config_get frag "$vif" frag
+ [ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}"
+
+ config_get rts "$vif" rts
+ [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
+
+ config_get_bool comp "$vif" compression
+ [ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
+
+ config_get_bool minrate "$vif" minrate
+ [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
+
+ config_get_bool maxrate "$vif" maxrate
+ [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
+
+ config_get_bool burst "$vif" bursting
+ [ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
+
+ config_get_bool wmm "$vif" wmm
+ [ -n "$wmm" ] && iwpriv "$ifname" wmm "$wmm"
+
+ config_get_bool xr "$vif" xr
+ [ -n "$xr" ] && iwpriv "$ifname" xr "$xr"
+
+ config_get_bool ar "$vif" ar
+ [ -n "$ar" ] && iwpriv "$ifname" ar "$ar"
+
+ config_get_bool turbo "$vif" turbo
+ [ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo"
+
+ config_get_bool doth "$vif" doth 0
+ [ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
+
+ config_get maclist "$vif" maclist
+ [ -n "$maclist" ] && {
+ # flush MAC list
+ iwpriv "$ifname" maccmd 3
+ for mac in $maclist; do
+ iwpriv "$ifname" addmac "$mac"
+ done
+ }
+
+ config_get macpolicy "$vif" macpolicy
+ case "$macpolicy" in
+ allow)
+ iwpriv "$ifname" maccmd 1
+ ;;
+ deny)
+ iwpriv "$ifname" maccmd 2
+ ;;
+ *)
+ # default deny policy if mac list exists
+ [ -n "$maclist" ] && iwpriv "$ifname" maccmd 2
+ ;;
+ esac
+
+ ifconfig "$ifname" up
local net_cfg bridge
net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
start_net "$ifname" "$net_cfg"
}
iwconfig "$ifname" essid "$ssid"
+ set_wifi_up "$vif" "$ifname"
case "$mode" in
ap)
+ 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
fi
;;
wds|sta)
- case "$enc" in
+ config_get_bool usepassphrase "$vif" passphrase 1
+ case "$enc" in
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
- proto='proto=WPA';;
+ proto='proto=WPA'
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
+ ;;
PSK2|psk2)
- proto='proto=RSN';;
+ proto='proto=RSN'
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
+ ;;
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"
+ $passphrase
}
EOF
;;
#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
+ [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
;;
esac
first=0
cat <<EOF
config wifi-device $dev
option type atheros
- option channel 5
-# option diversity 1
-# option txantenna 0
-# option rxantenna 0
-# option distance 2000
-# disable radio to prevent an open ap after reflashing:
- option disabled 1
+ option channel auto
+ # 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 txpower 15
-# option bgscan enable
option encryption none
-
EOF
done
}
projects / openwrt.git / blobdiff