local wds
local adhoc sta apmode mon
local adhoc_if sta_if ap_if mon_if
+ local _c=0
config_get vifs "$device" vifs
for vif in $vifs; do
config_get mode "$vif" mode
+ _c=$(($_c + 1))
case "$mode" in
adhoc)
adhoc=1
;;
wds)
config_get addr "$vif" bssid
- [ -z "$addr" ] || append wds "$addr"
+ [ -z "$addr" ] || {
+ addr=$(echo "$addr" | tr 'A-F' 'a-f')
+ append wds "$addr"
+ }
;;
monitor)
mon=1
ap=1
infra=1
- mssid=1
+ if [ "$_c" -gt 1 ]; then
+ mssid=1
+ else
+ mssid=
+ fi
apsta=0
radio=1
monitor=0
config_get vifs "$device" vifs
config_get distance "$device" distance
config_get slottime "$device" slottime
- config_get rxant "$device" rxant
- config_get txant "$device" txant
+ config_get rxantenna "$device" rxantenna
+ config_get txantenna "$device" txantenna
config_get_bool frameburst "$device" frameburst
config_get macfilter "$device" macfilter
config_get maclist "$device" maclist
- local vif_pre_up vif_post_up vif_do_up
+ config_get macaddr "$device" macaddr
+ local vif_pre_up vif_post_up vif_do_up txpower
_c=0
nas="$(which nas)"
esac
for vif in $vifs; do
+ config_get txpower "$vif" txpower
+
config_get mode "$vif" mode
append vif_pre_up "vif $_c" "$N"
append vif_post_up "vif $_c" "$N"
+ append vif_do_up "vif $_c" "$N"
[ "$mode" = "sta" ] || {
config_get_bool hidden "$vif" hidden 0
*) auth=2; wsec=2;;
esac
eval "${vif}_key=\"\$key\""
- nasopts="-r \"\$${vif}_key\" -h $server -p $port"
+ nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"
;;
esac
append vif_do_up "wsec $wsec" "$N"
config_get ifname "$vif" ifname
#append if_up "ifconfig $ifname up" ";$N"
+
local net_cfg bridge
net_cfg="$(find_net_config "$vif")"
[ -z "$net_cfg" ] || {
${wet:+wet 1}
802.11d 0
802.11h 0
-rxant ${rxant:-3}
-txant ${txant:-3}
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
monitor ${monitor:-0}
passive ${passive:-0}
wlc stdin <<EOF
$vif_do_up
EOF
+ [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm
+
eval "$nas_cmd"
}