package/broadcom-wl:

[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 1ce85c4..aa8258d 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,23 +1,16 @@
 append DRIVERS "broadcom"
 
 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"
 scan_broadcom() {
        local device="$1"

+       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
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
                config_get mode "$vif" mode

+               _c=$(($_c + 1))

                case "$mode" in
                        adhoc)
                                adhoc=1
                case "$mode" in
                        adhoc)
                                adhoc=1


@@ -28,18 +21,31 @@ scan_broadcom() {
                                sta_if="$vif"
                        ;;
                        ap)
                                sta_if="$vif"
                        ;;
                        ap)

-                               ap=1
+                               apmode=1

                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;
                                ap_if="${ap_if:+$ap_if }$vif"
                        ;;

+                       wds)
+                               config_get addr "$vif" bssid
+                               [ -z "$addr" ] || {
+                                       addr=$(echo "$addr" | tr 'A-F' 'a-f')
+                                       append wds "$addr"
+                               }
+                       ;;
+                       monitor)
+                               mon=1
+                               mon_if="$vif"
+                       ;;

                        *) echo "$device($vif): Invalid mode";;
                esac
        done
                        *) echo "$device($vif): Invalid mode";;
                esac
        done

+       config_set "$device" wds "$wds"

 
        local _c=
 
        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 "$vif" ifname "wl0${_c:+.$_c}"
                _c=$((${_c:-0} + 1))
        done

+       config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"

 
        ifdown="down"
        for vif in 0 1 2 3; do
 
        ifdown="down"
        for vif in 0 1 2 3; do


@@ -49,23 +55,36 @@ scan_broadcom() {
 
        ap=1
        infra=1
 
        ap=1
        infra=1

-       mssid=1
+       if [ "$_c" -gt 1 ]; then
+               mssid=1
+       else
+               mssid=
+       fi

        apsta=0
        radio=1
        apsta=0
        radio=1

-       case "$adhoc:$sta:$ap" in
+       monitor=0
+       passive=0
+       case "$adhoc:$sta:$apmode:$mon" in

                1*)
                        ap=0
                1*)
                        ap=0

-                       mssid=0
+                       mssid=

                        infra=0
                ;;
                        infra=0
                ;;

-               :1:1)
+               :1:1:)

                        apsta=1
                        wet=1
                ;;
                        apsta=1
                        wet=1
                ;;

-               :1:)
+               :1::)
+                       wet=1
+                       ap=0
+                       mssid=
+               ;;
+               :::1)

                        wet=1
                        ap=0
                        wet=1
                        ap=0

-                       mssid=0
+                       mssid=
+                       monitor=1
+                       passive=1

                ;;
                ::)
                        radio=0
                ;;
                ::)
                        radio=0


@@ -74,8 +93,19 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
 }
 
 disable_broadcom() {

+       set_wifi_down "$1"

        wlc down
        wlc down

-       ifconfig wl0 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

 }
 
 enable_broadcom() {
 }
 
 enable_broadcom() {


@@ -83,20 +113,56 @@ enable_broadcom() {
        config_get channel "$device" channel
        config_get country "$device" country
        config_get maxassoc "$device" maxassoc
        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 rxantenna "$device" rxantenna
+       config_get txantenna "$device" txantenna
+       config_get_bool frameburst "$device" frameburst
+       config_get macfilter "$device" macfilter
+       config_get maclist "$device" maclist
+       config_get macaddr "$device" macaddr
+       config_get txpower "$device" txpower
+       local vif_pre_up vif_post_up vif_do_up

 
        _c=0
        nas="$(which nas)"
        nas_cmd=
        if_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"
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"

+               append vif_do_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"
                        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
                }
 
                wsec_r=0


@@ -108,13 +174,30 @@ enable_broadcom() {
                case "$enc" in
                        WEP|wep)
                                wsec_r=1
                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
                        ;;
                        *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\""
                                esac
                                eval "${vif}_key=\"\$key\""
                                nasopts="-k \"\$${vif}_key\""


@@ -126,31 +209,55 @@ enable_broadcom() {
                                config_get server "$vif" server
                                config_get port "$vif" port
                                case "$enc" in
                                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;;
                                        wpa2*|WPA2*) auth=64; wsec=4;;

-                                       *) auth=2; crypto=2;;
+                                       *) auth=2; wsec=2;;

                                esac
                                eval "${vif}_key=\"\$key\""
                                esac
                                eval "${vif}_key=\"\$key\""

-                               nasopts="-r \"\$${vif}_key\" -h $server -p $port"
+                               nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"

                        ;;
                esac
                        ;;
                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
                
                config_get ssid "$vif" ssid

-               append vif_post_up "vlan_mode 0"
+               append vif_post_up "vlan_mode 0" "$N"

                append vif_post_up "ssid $ssid" "$N"
                append vif_post_up "ssid $ssid" "$N"

+               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 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"
+               [ -z "$macaddr" ] || append if_up "ifconfig $ifname hw ether $macaddr" ";$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" ] || {
                [ -z "$nasopts" ] || {

-                       bridge="$(bridge_interface "$ifname")"

                        eval "${vif}_ssid=\"\$ssid\""
                        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
                }
                _c=$(($_c + 1))
        done


@@ -158,26 +265,40 @@ enable_broadcom() {
        wlc stdin <<EOF
 $ifdown
 
        wlc stdin <<EOF
 $ifdown
 

-mssid $mssid

 ap $ap
 ap $ap

+${mssid:+mssid $mssid}

 apsta $apsta
 infra $infra
 ${wet:+wet 1}
 apsta $apsta
 infra $infra
 ${wet:+wet 1}

+802.11d 0
+802.11h 0
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
+monitor ${monitor:-0}
+passive ${passive:-0}

 
 radio ${radio:-1}
 
 radio ${radio:-1}

-macfilter 0
-maclist none
+macfilter ${macfilter:-0}
+maclist ${maclist:-none}

 wds none
 wds none

-channel ${channel:-0}
+${wds:+wds $wds}

 country ${country:-IL0}
 country ${country:-IL0}

+${channel:+channel $channel}

 maxassoc ${maxassoc:-128}
 maxassoc ${maxassoc:-128}

+slottime ${slottime:--1}
+${frameburst:+frameburst $frameburst}

 
 $vif_pre_up
 up
 $vif_post_up
 EOF
 
 $vif_pre_up
 up
 $vif_post_up
 EOF

-       eval "$nas_cmd"

        eval "$if_up"
        eval "$if_up"

+       wlc stdin <<EOF
+$vif_do_up
+EOF
+       [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+
+       eval "$nas_cmd"

 }
 
 
 }
 
 


@@ -190,12 +311,14 @@ config wifi-device  wl0
        option type     broadcom
        option channel  5
 
        option type     broadcom
        option channel  5
 

+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
+

 config wifi-iface
        option device   wl0
 config wifi-iface
        option device   wl0

+       option network  lan

        option mode     ap
        option ssid     OpenWrt
        option mode     ap
        option ssid     OpenWrt

-       option hidden   0

        option encryption none
        option encryption none

-

 EOF
 }
 EOF
 }