X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/fd40fb97f848901b4d3c197d0e83e95b01312f9a..0bf84185a31085ee12512035da0a86536b7f9b1b:/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 7852ae962..2e6f2e8e4 100644 --- a/package/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh @@ -1,17 +1,10 @@ -bridge_interface() { - ( - . /etc/functions.sh - include network - scan_interfaces - cfg="$(find_config "$1")" - [ -z "$cfg" ] && return 0 - config_get iftype "$cfg" type - [ "$iftype" = bridge ] && config_get "$iftype" bridge - ) -} +append DRIVERS "broadcom" scan_broadcom() { local device="$1" + local wds + local adhoc sta apmode + local adhoc_if sta_if ap_if config_get vifs "$device" vifs for vif in $vifs; do @@ -26,18 +19,24 @@ scan_broadcom() { sta_if="$vif" ;; ap) - ap=1 + apmode=1 ap_if="${ap_if:+$ap_if }$vif" ;; + wds) + config_get addr "$vif" bssid + [ -z "$addr" ] || append wds "$addr" + ;; *) echo "$device($vif): Invalid mode";; esac done + config_set "$device" wds "$wds" local _c= for vif in ${adhoc_if:-$sta_if $ap_if}; do config_set "$vif" ifname "wl0${_c:+.$_c}" _c=$((${_c:-0} + 1)) done + config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if}" ifdown="down" for vif in 0 1 2 3; do @@ -50,10 +49,10 @@ scan_broadcom() { mssid=1 apsta=0 radio=1 - case "$adhoc:$sta:$ap" in + case "$adhoc:$sta:$apmode" in 1*) ap=0 - mssid=0 + mssid= infra=0 ;; :1:1) @@ -63,7 +62,7 @@ scan_broadcom() { :1:) wet=1 ap=0 - mssid=0 + mssid= ;; ::) radio=0 @@ -71,26 +70,73 @@ scan_broadcom() { esac } +disable_broadcom() { + set_wifi_down "$1" + wlc down + ( + include /lib/network + + # make sure the interfaces are down and removed from all bridges + for dev in wl0 wl0.1 wl0.2 wl0.3; do + ifconfig "$dev" down 2>/dev/null >/dev/null && { + unbridge "$dev" + } + done + ) + true +} -setup_broadcom() { +enable_broadcom() { local _c config_get channel "$device" channel config_get country "$device" country config_get maxassoc "$device" maxassoc + config_get wds "$device" wds + 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 macfilter "$device" macfilter + config_get maclist "$device" maclist + local vif_pre_up vif_post_up vif_do_up _c=0 nas="$(which nas)" nas_cmd= if_up= - for vif in ${adhoc_if:-$sta_if $ap_if}; do + + [ -z "$slottime" ] && { + [ -n "$distance" ] && { + # slottime = 9 + (distance / 150) + (distance % 150 ? 1 : 0) + slottime="$((9 + ($distance / 150) + 1 - (150 - ($distance % 150)) / 150 ))" + } + } || { + 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 append vif_pre_up "vif $_c" "$N" append vif_post_up "vif $_c" "$N" - [ "$vif" = "$sta_if" ] || { - config_get_bool hidden "$vif" hidden 1 + [ "$mode" = "sta" ] || { + config_get_bool hidden "$vif" hidden 0 append vif_pre_up "closed $hidden" "$N" - config_get_bool isolate "$vif" isolate - append vif_pre_up "ap_isolate $hidden" "$N" + config_get_bool isolate "$vif" isolate 0 + append vif_pre_up "ap_isolate $isolate" "$N" } wsec_r=0 @@ -102,13 +148,30 @@ setup_broadcom() { case "$enc" in WEP|wep) wsec_r=1 + wsec=1 + defkey=1 + config_get key "$vif" key + case "$key" in + [1234]) + defkey="$key" + for knr in 1 2 3 4; do + config_get k "$vif" key$knr + [ -n "$k" ] || continue + [ "$defkey" = "$knr" ] && def="=" || def="" + append vif_do_up "wepkey $def$knr,$k" "$N" + done + ;; + "");; + *) 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;; - *) auth=4; crypto=2;; + 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\"" nasopts="-k \"\$${vif}_key\"" @@ -120,30 +183,49 @@ setup_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; crypto=2;; + *) auth=2; wsec=2;; esac eval "${vif}_key=\"\$key\"" nasopts="-r \"\$${vif}_key\" -h $server -p $port" ;; 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" + append vif_do_up "ssid $ssid" "$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" ] || { - bridge="$(bridge_interface "$ifname")" 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 $crypto -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 @@ -151,26 +233,55 @@ setup_broadcom() { wlc stdin <