fix wepkey default (#972)

[openwrt.git] / 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 bc90f08..79c1680 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,19 +1,10 @@
 append DRIVERS "broadcom"
 
-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
-       )
-}
-
 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
@@ -28,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
@@ -52,7 +49,7 @@ scan_broadcom() {
        mssid=1
        apsta=0
        radio=1
-       case "$adhoc:$sta:$ap" in
+       case "$adhoc:$sta:$apmode" in
                1*)
                        ap=0
                        mssid=0
@@ -85,6 +82,7 @@ disable_broadcom() {
                        }
                done
        )
+       true
 }
 
 enable_broadcom() {
@@ -92,20 +90,36 @@ enable_broadcom() {
        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
+       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}"
+       }
+
+       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" ] || {
+               [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 1
                        append vif_pre_up "closed $hidden" "$N"
                        config_get_bool isolate "$vif" isolate
-                       append vif_pre_up "ap_isolate $hidden" "$N"
+                       append vif_pre_up "ap_isolate $isolate" "$N"
                }
 
                wsec_r=0
@@ -116,7 +130,23 @@ enable_broadcom() {
                config_get enc "$vif" encryption
                case "$enc" in
                        WEP|wep)
-                               wsec_r=1
+                               wsec_r=0
+                               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_pre_up "wepkey $def$knr,$k" "$N"
+                                               done
+                                       ;;
+                                       "");;
+                                       *) append vif_pre_up "wepkey =1,$key" "$N";;
+                               esac
                        ;;
                        *psk*|*PSK*)
                                wsec_r=1
@@ -150,12 +180,21 @@ enable_broadcom() {
                config_get ssid "$vif" ssid
                append vif_post_up "vlan_mode 0"
                append vif_post_up "ssid $ssid" "$N"
+               case "$mode" in
+                       sta|adhoc) append vif_do_up "ssid $ssid" "$N";;
+               esac
+               
                append vif_post_up "enabled 1" "$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" ] || {
+                       bridge="$(bridge_interface "$net_cfg")"
+                       append if_up "start_net '$ifname' '$net_cfg'" ";$N"
+               }
                [ -z "$nasopts" ] || {
-                       bridge="$(bridge_interface "$ifname")"
                        eval "${vif}_ssid=\"\$ssid\""
                        mode="-A"
                        [ "$vif" = "$sta_if" ] && mode="-S"
@@ -167,8 +206,8 @@ enable_broadcom() {
        wlc stdin <<EOF
 $ifdown
 
-mssid $mssid
 ap $ap
+mssid $mssid
 apsta $apsta
 infra $infra
 ${wet:+wet 1}
@@ -176,17 +215,21 @@ ${wet:+wet 1}
 radio ${radio:-1}
 macfilter 0
 maclist none
-wds none
+wds ${wds:-none}
 channel ${channel:-0}
 country ${country:-IL0}
 maxassoc ${maxassoc:-128}
+slottime ${slottime:--1}
 
 $vif_pre_up
 up
 $vif_post_up
 EOF
-       eval "$nas_cmd"
        eval "$if_up"
+       wlc stdin <<EOF
+$vif_do_up
+EOF
+       eval "$nas_cmd"
 }