X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/af5a1e3a29c9a33f3d1083e8d1421785569cc763..3534ad142579a9c6bff639f5270fe278b39434a3:/package/broadcom-wl/files/lib/wifi/broadcom.sh diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh index baa06f574..d7d18dbd5 100644 --- a/package/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh @@ -3,8 +3,8 @@ append DRIVERS "broadcom" scan_broadcom() { local device="$1" local wds - local adhoc sta apmode - local adhoc_if sta_if ap_if + local adhoc sta apmode mon + local adhoc_if sta_if ap_if mon_if config_get vifs "$device" vifs for vif in $vifs; do @@ -26,17 +26,21 @@ scan_broadcom() { config_get addr "$vif" bssid [ -z "$addr" ] || append wds "$addr" ;; + monitor) + mon=1 + mon_if="$vif" + ;; *) echo "$device($vif): Invalid mode";; esac done config_set "$device" wds "$wds" local _c= - for vif in ${adhoc_if:-$sta_if $ap_if}; do + for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do config_set "$vif" ifname "wl0${_c:+.$_c}" _c=$((${_c:-0} + 1)) done - config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if}" + config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}" ifdown="down" for vif in 0 1 2 3; do @@ -49,20 +53,29 @@ scan_broadcom() { mssid=1 apsta=0 radio=1 - case "$adhoc:$sta:$apmode" in + monitor=0 + passive=0 + case "$adhoc:$sta:$apmode:$mon" in 1*) ap=0 - mssid=0 + mssid= infra=0 ;; - :1:1) + :1:1:) apsta=1 wet=1 ;; - :1:) + :1::) wet=1 ap=0 - mssid=0 + mssid= + ;; + :::1) + wet=1 + ap=0 + mssid= + monitor=1 + passive=1 ;; ::) radio=0 @@ -71,6 +84,7 @@ scan_broadcom() { } disable_broadcom() { + set_wifi_down "$1" wlc down ( include /lib/network @@ -94,6 +108,11 @@ enable_broadcom() { 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_bool frameburst "$device" frameburst + config_get macfilter "$device" macfilter + config_get maclist "$device" maclist local vif_pre_up vif_post_up vif_do_up _c=0 @@ -109,6 +128,18 @@ enable_broadcom() { } || { slottime="${slottime:--1}" } + + case "$macfilter" in + allow|2) + macfilter=2; + ;; + deny|1) + macfilter=1; + ;; + disable|none|0) + macfilter=0; + ;; + esac for vif in $vifs; do config_get mode "$vif" mode @@ -116,9 +147,9 @@ enable_broadcom() { append vif_post_up "vif $_c" "$N" [ "$mode" = "sta" ] || { - config_get_bool hidden "$vif" hidden 1 + config_get_bool hidden "$vif" hidden 0 append vif_pre_up "closed $hidden" "$N" - config_get_bool isolate "$vif" isolate + config_get_bool isolate "$vif" isolate 0 append vif_pre_up "ap_isolate $isolate" "$N" } @@ -141,18 +172,19 @@ enable_broadcom() { config_get k "$vif" key$knr [ -n "$k" ] || continue [ "$defkey" = "$knr" ] && def="=" || def="" - append vif_pre_up "wepkey $def$knr,$k" "$N" + append vif_do_up "wepkey $def$knr,$k" "$N" done ;; "");; - *) append vif_pre_up "wepkey =1,$key" "$N";; + *) append vif_do_up "wepkey =1,$key" "$N";; esac ;; *psk*|*PSK*) wsec_r=1 config_get key "$vif" key case "$enc" in - wpa2*|WPA2*|PSK2*|psk2*) auth=128; wsec=4;; + wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;; + wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;; *) auth=4; wsec=2;; esac eval "${vif}_key=\"\$key\"" @@ -165,40 +197,54 @@ enable_broadcom() { config_get server "$vif" server config_get port "$vif" port case "$enc" in + wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;; wpa2*|WPA2*) auth=64; wsec=4;; *) 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_post_up "wsec $wsec" "$N" - append vif_post_up "wpa_auth $auth" "$N" - append vif_post_up "wsec_restrict $wsec_r" "$N" - append vif_post_up "eap_restrict $eap_r" "$N" + append vif_do_up "wsec $wsec" "$N" + append vif_do_up "wpa_auth $auth" "$N" + append vif_do_up "wsec_restrict $wsec_r" "$N" + append vif_do_up "eap_restrict $eap_r" "$N" config_get ssid "$vif" ssid append vif_post_up "vlan_mode 0" "$N" append vif_post_up "ssid $ssid" "$N" - case "$mode" in - sta|adhoc) append vif_do_up "ssid $ssid" "$N";; - esac + append vif_do_up "ssid $ssid" "$N" + + [ "$mode" = "monitor" ] && { + append vif_post_up "monitor $monitor" "$N" + append vif_post_up "passive $passive" "$N" + } append vif_post_up "enabled 1" "$N" config_get ifname "$vif" ifname - append if_up "ifconfig $ifname up" ";$N" + #append if_up "ifconfig $ifname up" ";$N" local net_cfg bridge net_cfg="$(find_net_config "$vif")" [ -z "$net_cfg" ] || { bridge="$(bridge_interface "$net_cfg")" append if_up "start_net '$ifname' '$net_cfg'" ";$N" + append if_up "set_wifi_up '$vif' '$ifname'" ";$N" } [ -z "$nasopts" ] || { eval "${vif}_ssid=\"\$ssid\"" - mode="-A" - [ "$vif" = "$sta_if" ] && mode="-S" - [ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &" + nas_mode="-A" + use_nas=1 + [ "$mode" = "sta" ] && { + nas_mode="-S" + [ -z "$bridge" ] || { + append vif_post_up "supplicant 1" "$N" + append vif_post_up "passphrase $key" "$N" + + use_nas=0 + } + } + [ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &" } _c=$(($_c + 1)) done @@ -207,21 +253,27 @@ enable_broadcom() { $ifdown ap $ap -mssid $mssid +${mssid:+mssid $mssid} apsta $apsta infra $infra ${wet:+wet 1} 802.11d 0 802.11h 0 +rxant ${rxant:-3} +txant ${txant:-3} +monitor ${monitor:-0} +passive ${passive:-0} radio ${radio:-1} -macfilter 0 -maclist none -wds ${wds:-none} -${channel:+channel $channel} +macfilter ${macfilter:-0} +maclist ${maclist:-none} +wds none +${wds:+wds $wds} country ${country:-IL0} +${channel:+channel $channel} maxassoc ${maxassoc:-128} slottime ${slottime:--1} +${frameburst:+frameburst $frameburst} $vif_pre_up up @@ -243,7 +295,8 @@ detect_broadcom() { config wifi-device wl0 option type broadcom option channel 5 -# disable radio to prevent an open ap after reflashing: + + # REMOVE THIS LINE TO ENABLE WIFI: option disabled 1 config wifi-iface @@ -251,8 +304,6 @@ config wifi-iface option network lan option mode ap option ssid OpenWrt - option hidden 0 option encryption none - EOF }