projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
uhttpd: Fix wrong certificate options with multiple words
[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 9ce49ab..8fe801d 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -3,12 +3,15 @@ append DRIVERS "broadcom"
 scan_broadcom() {
        local device="$1"
        local wds
 scan_broadcom() {
        local device="$1"
        local wds
-       local adhoc sta apmode mon
+       local adhoc sta apmode mon disabled
        local adhoc_if sta_if ap_if mon_if
        local _c=0
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
        local adhoc_if sta_if ap_if mon_if
        local _c=0
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
+               config_get_bool disabled "$vif" disabled 0
+               [ $disabled -eq 0 ] || continue
+
                config_get mode "$vif" mode
                _c=$(($_c + 1))
                case "$mode" in
                config_get mode "$vif" mode
                _c=$(($_c + 1))
                case "$mode" in
@@ -42,7 +45,7 @@ scan_broadcom() {
 
        local _c=
        for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
 
        local _c=
        for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do
-               config_set "$vif" ifname "wl0${_c:+.$_c}"
+               config_set "$vif" ifname "${device}${_c:+.$_c}"
                _c=$((${_c:-0} + 1))
        done
        config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
                _c=$((${_c:-0} + 1))
        done
        config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}"
@@ -63,7 +66,6 @@ scan_broadcom() {
        apsta=0
        radio=1
        monitor=0
        apsta=0
        radio=1
        monitor=0
-       passive=0
        case "$adhoc:$sta:$apmode:$mon" in
                1*)
                        ap=0
        case "$adhoc:$sta:$apmode:$mon" in
                1*)
                        ap=0
@@ -84,7 +86,6 @@ scan_broadcom() {
                        ap=0
                        mssid=
                        monitor=1
                        ap=0
                        mssid=
                        monitor=1
-                       passive=1
                ;;
                ::)
                        radio=0
                ;;
                ::)
                        radio=0
@@ -93,13 +94,15 @@ scan_broadcom() {
 }
 
 disable_broadcom() {
 }
 
 disable_broadcom() {
-       set_wifi_down "$1"
-       wlc down
+       local device="$1"
+       set_wifi_down "$device"
+       wlc ifname "$device" down
+       wlc ifname "$device" bssid `wlc ifname "$device" default_bssid`
        (
                include /lib/network
 
                # make sure the interfaces are down and removed from all bridges
        (
                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
+               for dev in $device ${device}.1 ${device}.2 ${device}.3; do
                        ifconfig "$dev" down 2>/dev/null >/dev/null && {
                                unbridge "$dev"
                        }
                        ifconfig "$dev" down 2>/dev/null >/dev/null && {
                                unbridge "$dev"
                        }
@@ -109,6 +112,7 @@ disable_broadcom() {
 }
 
 enable_broadcom() {
 }
 
 enable_broadcom() {
+       local device="$1"
        local _c
        config_get channel "$device" channel
        config_get country "$device" country
        local _c
        config_get channel "$device" channel
        config_get country "$device" country
@@ -124,7 +128,12 @@ enable_broadcom() {
        config_get maclist "$device" maclist
        config_get macaddr "$device" macaddr
        config_get txpower "$device" txpower
        config_get maclist "$device" maclist
        config_get macaddr "$device" macaddr
        config_get txpower "$device" txpower
+       config_get frag "$device" frag
+       config_get rts "$device" rts
+       config_get hwmode "$device" hwmode
        local vif_pre_up vif_post_up vif_do_up vif_txpower
        local vif_pre_up vif_post_up vif_do_up vif_txpower
+       local doth=0
+       local wmm=0
 
        _c=0
        nas="$(which nas)"
 
        _c=0
        nas="$(which nas)"
@@ -139,7 +148,7 @@ enable_broadcom() {
        } || {
                slottime="${slottime:--1}"
        }
        } || {
                slottime="${slottime:--1}"
        }
-       
+
        case "$macfilter" in
                allow|2)
                        macfilter=2;
        case "$macfilter" in
                allow|2)
                        macfilter=2;
@@ -152,6 +161,15 @@ enable_broadcom() {
                ;;
        esac
 
                ;;
        esac
 
+       case "$hwmode" in
+               *b)   hwmode=0;;
+               *bg)  hwmode=1;;
+               *g)   hwmode=2;;
+               *gst) hwmode=4;;
+               *lrs) hwmode=5;;
+               *)    hwmode=1;;
+       esac
+
        for vif in $vifs; do
                config_get vif_txpower "$vif" txpower
 
        for vif in $vifs; do
                config_get vif_txpower "$vif" txpower
 
@@ -159,7 +177,10 @@ enable_broadcom() {
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
                append vif_do_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"
-               
+
+               config_get_bool wmm "$vif" wmm "$wmm"
+               config_get_bool doth "$vif" doth "$doth"
+
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0
                        append vif_pre_up "closed $hidden" "$N"
                [ "$mode" = "sta" ] || {
                        config_get_bool hidden "$vif" hidden 0
                        append vif_pre_up "closed $hidden" "$N"
@@ -174,11 +195,15 @@ enable_broadcom() {
                nasopts=
                config_get enc "$vif" encryption
                case "$enc" in
                nasopts=
                config_get enc "$vif" encryption
                case "$enc" in
-                       WEP|wep)
+                       *wep*)
                                wsec_r=1
                                wsec=1
                                defkey=1
                                config_get key "$vif" key
                                wsec_r=1
                                wsec=1
                                defkey=1
                                config_get key "$vif" key
+                               case "$enc" in
+                                       *shared*) append vif_do_up "wepauth 1" "$N";;
+                                       *) append vif_do_up "wepauth 0" "$N";;
+                               esac
                                case "$key" in
                                        [1234])
                                                defkey="$key"
                                case "$key" in
                                        [1234])
                                                defkey="$key"
@@ -193,38 +218,63 @@ enable_broadcom() {
                                        *) append vif_do_up "wepkey =1,$key" "$N";;
                                esac
                        ;;
                                        *) append vif_do_up "wepkey =1,$key" "$N";;
                                esac
                        ;;
-                       *psk*|*PSK*)
+                       *psk*)
                                wsec_r=1
                                config_get key "$vif" key
                                wsec_r=1
                                config_get key "$vif" key
+
+                               # psk version + default cipher
                                case "$enc" in
                                case "$enc" in
-                                       wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;;
-                                       wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;;
-                                       *aes|*AES) auth=4; wsec=4;;
+                                       *mixed*|*psk+psk2*) auth=132; wsec=6;;
+                                       *psk2*) auth=128; wsec=4;;
                                        *) auth=4; wsec=2;;
                                esac
                                        *) auth=4; wsec=2;;
                                esac
+
+                               # cipher override
+                               case "$enc" in
+                                       *tkip+aes*|*tkip+ccmp*|*aes+tkip*|*ccmp+tkip*) wsec=6;;
+                                       *aes*|*ccmp*) wsec=4;;
+                                       *tkip*) wsec=2;;
+                               esac
+
+                               # group rekey interval
+                               config_get rekey "$vif" wpa_group_rekey
+
                                eval "${vif}_key=\"\$key\""
                                eval "${vif}_key=\"\$key\""
-                               nasopts="-k \"\$${vif}_key\""
+                               nasopts="-k \"\$${vif}_key\"${rekey:+ -g $rekey}"
                        ;;
                        ;;
-                       *wpa*|*WPA*)
+                       *wpa*)
                                wsec_r=1
                                eap_r=1
                                config_get key "$vif" key
                                config_get server "$vif" server
                                config_get port "$vif" port
                                wsec_r=1
                                eap_r=1
                                config_get key "$vif" key
                                config_get server "$vif" server
                                config_get port "$vif" port
+
+                               # wpa version + default cipher
                                case "$enc" in
                                case "$enc" in
-                                       wpa*+wpa2*|WPA*+WPA2*) auth=66; wsec=6;;
-                                       wpa2*|WPA2*) auth=64; wsec=4;;
+                                       *mixed*|*wpa+wpa2*) auth=66; wsec=6;;
+                                       *wpa2*) auth=64; wsec=4;;
                                        *) auth=2; wsec=2;;
                                esac
                                        *) auth=2; wsec=2;;
                                esac
+
+                               # cipher override
+                               case "$enc" in
+                                       *tkip+aes*|*tkip+ccmp*|*aes+tkip*|*ccmp+tkip*) wsec=6;;
+                                       *aes*|*ccmp*) wsec=4;;
+                                       *tkip*) wsec=2;;
+                               esac
+
+                               # group rekey interval
+                               config_get rekey "$vif" wpa_group_rekey
+
                                eval "${vif}_key=\"\$key\""
                                eval "${vif}_key=\"\$key\""
-                               nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}"
+                               nasopts="-r \"\$${vif}_key\" -h $server -p ${port:-1812}${rekey:+ -g $rekey}"
                        ;;
                esac
                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"
                        ;;
                esac
                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"
                config_get ssid "$vif" ssid
                append vif_post_up "vlan_mode 0" "$N"
                append vif_post_up "ssid $ssid" "$N"
@@ -232,68 +282,64 @@ enable_broadcom() {
 
                [ "$mode" = "monitor" ] && {
                        append vif_post_up "monitor $monitor" "$N"
 
                [ "$mode" = "monitor" ] && {
                        append vif_post_up "monitor $monitor" "$N"
-                       append vif_post_up "passive $passive" "$N"
                }
 
                [ "$mode" = "adhoc" ] && {
                        config_get bssid "$vif" bssid
                        [ -n "$bssid" ] && {
                }
 
                [ "$mode" = "adhoc" ] && {
                        config_get bssid "$vif" bssid
                        [ -n "$bssid" ] && {
-                               append vif_pre_up "des_bssid $bssid" "$N"
-                               append vif_pre_up "allow_mode 1" "$N"
+                               append vif_pre_up "bssid $bssid" "$N"
+                               append vif_pre_up "ibss_merge 0" "$N"
+                       } || {
+                               append vif_pre_up "ibss_merge 1" "$N"
                        }
                        }
-               } || append vif_pre_up "allow_mode 0" "$N"
-               
+               }
+
                append vif_post_up "enabled 1" "$N"
                append vif_post_up "enabled 1" "$N"
-               
+
                config_get ifname "$vif" ifname
                #append if_up "ifconfig $ifname up" ";$N"
 
                config_get ifname "$vif" ifname
                #append if_up "ifconfig $ifname up" ";$N"
 
-               local net_cfg bridge
+               local net_cfg
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
-                       bridge="$(bridge_interface "$net_cfg")"
                        append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
                        append if_up "set_wifi_up '$vif' '$ifname'" ";$N"
-                       append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N"
+                       append if_up "start_net '$ifname' '$net_cfg'" ";$N"
                }
                [ -z "$nasopts" ] || {
                        eval "${vif}_ssid=\"\$ssid\""
                        nas_mode="-A"
                }
                [ -z "$nasopts" ] || {
                        eval "${vif}_ssid=\"\$ssid\""
                        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
-                               }
+                       [ "$mode" = "sta" ] && nas_mode="-S"
+                       [ -z "$nas" ] || {
+                               nas_cmd="${nas_cmd:+$nas_cmd$N}start-stop-daemon -S -b -p /var/run/nas.$ifname.pid -x $nas -- -P /var/run/nas.$ifname.pid -H 34954 -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 -F $nasopts"
                        }
                        }
-                       [ -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
        killall -KILL nas >&- 2>&-
                }
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-
-       wlc stdin <<EOF
+       wlc ifname "$device" stdin <<EOF
 $ifdown
 
 $ifdown
 
+gmode ${hwmode:-1}
+apsta $apsta
 ap $ap
 ${mssid:+mssid $mssid}
 ap $ap
 ${mssid:+mssid $mssid}
-apsta $apsta
 infra $infra
 ${wet:+wet 1}
 802.11d 0
 infra $infra
 ${wet:+wet 1}
 802.11d 0
-802.11h 0
+802.11h ${doth:-0}
+wme ${wmm:-0}
 rxant ${rxantenna:-3}
 txant ${txantenna:-3}
 rxant ${rxantenna:-3}
 txant ${txantenna:-3}
+fragthresh ${frag:-2346}
+rtsthresh ${rts:-2347}
 monitor ${monitor:-0}
 monitor ${monitor:-0}
-passive ${passive:-0}
 
 radio ${radio:-1}
 macfilter ${macfilter:-0}
 maclist ${maclist:-none}
 wds none
 ${wds:+wds $wds}
 
 radio ${radio:-1}
 macfilter ${macfilter:-0}
 maclist ${maclist:-none}
 wds none
 ${wds:+wds $wds}
-country ${country:-IL0}
+country ${country:-US}
 ${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
 ${channel:+channel $channel}
 maxassoc ${maxassoc:-128}
 slottime ${slottime:--1}
@@ -304,7 +350,7 @@ up
 $vif_post_up
 EOF
        eval "$if_up"
 $vif_post_up
 EOF
        eval "$if_up"
-       wlc stdin <<EOF
+       wlc ifname "$device" stdin <<EOF
 $vif_do_up
 EOF
 
 $vif_do_up
 EOF
 
@@ -318,22 +364,26 @@ EOF
 
 
 detect_broadcom() {
 
 
 detect_broadcom() {
-       [ -f /proc/net/wl0 ] || return
-       config_get type wl0 type
-       [ "$type" = broadcom ] && return
-       cat <<EOF
-config wifi-device  wl0
+       local i=-1
+
+       while grep -qs "^ *wl$((++i)):" /proc/net/dev; do
+               config_get type wl${i} type
+               [ "$type" = broadcom ] && continue
+               cat <<EOF
+config wifi-device  wl${i}
        option type     broadcom
        option type     broadcom
-       option channel  5
+       option channel  11
 
        # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1
 
 config wifi-iface
 
        # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1
 
 config wifi-iface
-       option device   wl0
+       option device   wl${i}
        option network  lan
        option mode     ap
        option network  lan
        option mode     ap
-       option ssid     OpenWrt
+       option ssid     OpenWrt${i#0}
        option encryption none
        option encryption none
+
 EOF
 EOF
+       done
 }
 }
Personal OpenWRT clone
This page took 0.040249 seconds and 4 git commands to generate.