projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
enable TCP ECN by default (see #3001 for more information)
[openwrt.git] / package / madwifi / files / lib / wifi / madwifi.sh
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 10e8ab1..bec7238 100755 (executable)
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -14,18 +14,17 @@ scan_atheros() {
                
                config_get mode "$vif" mode
                case "$mode" in
                
                config_get mode "$vif" mode
                case "$mode" in
-                       adhoc|sta|ap)
+                       adhoc|ahdemo|sta|ap|monitor)
                                append $mode "$vif"
                        ;;
                        wds)
                                append $mode "$vif"
                        ;;
                        wds)
-                               config_get addr "$vif" bssid
                                config_get ssid "$vif" ssid
                                config_get ssid "$vif" ssid
-                               [ -z "$addr" -a -n "$ssid" ] && {
-                                       config_set "$vif" wds 1
-                                       config_set "$vif" mode sta
-                                       mode="sta"
-                                       addr="$ssid"
-                               }
+                               [ -z "$ssid" ] && continue
+
+                               config_set "$vif" wds 1
+                               config_set "$vif" mode sta
+                               mode="sta"
+                               addr="$ssid"
                                ${addr:+append $mode "$vif"}
                        ;;
                        *) echo "$device($vif): Invalid mode, ignored."; continue;;
                                ${addr:+append $mode "$vif"}
                        ;;
                        *) echo "$device($vif): Invalid mode, ignored."; continue;;
@@ -35,6 +34,7 @@ scan_atheros() {
        case "${adhoc:+1}:${sta:+1}:${ap+1}" in
                # valid mode combinations
                1::) wds="";;
        case "${adhoc:+1}:${sta:+1}:${ap+1}" in
                # valid mode combinations
                1::) wds="";;
+               1::1);;
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
                :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA
                :1:);;
                ::1);;
@@ -42,13 +42,14 @@ scan_atheros() {
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }"
+       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
 }
 
 
 disable_atheros() (
        local device="$1"
 
 }
 
 
 disable_atheros() (
        local device="$1"
 
+       set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that
        # are running on atheros vifs 
        for pid in `pidof hostapd wpa_supplicant`; do
        # kill all running hostapd and wpa_supplicant processes that
        # are running on atheros vifs 
        for pid in `pidof hostapd wpa_supplicant`; do
@@ -69,15 +70,18 @@ disable_atheros() (
 )
 
 enable_atheros() {
 )
 
 enable_atheros() {
+       local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs
        config_get channel "$device" channel
        config_get vifs "$device" vifs
-       
-       disable_atheros "$device"
+
+       [ auto = "$channel" ] && channel=0
+
        local first=1
        for vif in $vifs; do
                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
        local first=1
        for vif in $vifs; do
                nosbeacon=
                config_get ifname "$vif" ifname
                config_get enc "$vif" encryption
+               config_get eap_type "$vif" eap_type
                config_get mode "$vif" mode
                
                [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
                config_get mode "$vif" mode
                
                [ "$mode" = sta ] && config_get nosbeacon "$device" nosbeacon
@@ -92,24 +96,34 @@ enable_atheros() {
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
 
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
-                       config_get agmode "$device" mode
+                       config_get agmode "$device" agmode
+                       [ -z "$agmode" ] && config_get agmode "$device" mode
+
                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;
                                *bg) agmode=11g;;
                                *g) agmode=11g; pureg=1;;
                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;
                                *bg) agmode=11g;;
                                *g) agmode=11g; pureg=1;;
+                               *gdt) agmode=11gdt;;
                                *a) agmode=11a;;
                                *a) agmode=11a;;
-                               *) agmode=11g;;
+                               *adt) agmode=11adt;;
+                               *ast) agmode=11ast;;
+                               *fh) agmode=fh;;
+                               *) agmode=auto;;
                        esac
                        esac
-                       iwconfig "$ifname" channel 0 
                        iwpriv "$ifname" mode "$agmode"
                        iwpriv "$ifname" pureg "$pureg"
                        iwpriv "$ifname" mode "$agmode"
                        iwpriv "$ifname" pureg "$pureg"
-                       iwconfig "$ifname" channel "$channel"
+                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
                }
        
                }
        
-               config_get_bool hidden "$vif" hidden
+               config_get_bool hidden "$vif" hidden 0
                iwpriv "$ifname" hide_ssid "$hidden"
 
                iwpriv "$ifname" hide_ssid "$hidden"
 
+               config_get ff "$vif" ff
+               if [ -n "$ff" ]; then
+                       iwpriv "$ifname" ff "$ff"
+               fi
+
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
                config_get wds "$vif" wds
                case "$wds" in
                        1|on|enabled) wds=1;;
@@ -117,6 +131,11 @@ enable_atheros() {
                esac
                iwpriv "$ifname" wds "$wds"
 
                esac
                iwpriv "$ifname" wds "$wds"
 
+               [ "$mode" = ap -a "$wds" = 1 ] && {
+                       config_get_bool wdssep "$vif" wdssep 1
+                       [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep"
+               }
+
                wpa=
                case "$enc" in
                        WEP|wep)
                wpa=
                case "$enc" in
                        WEP|wep)
@@ -125,21 +144,108 @@ enable_atheros() {
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key
                                        iwconfig "$ifname" enc "[$idx]" "${key:-off}"
                                done
                                config_get key "$vif" key
-                               iwconfig "$ifname" enc "${key:-1}"
+                               key="${key:-1}"
+                               case "$key" in
+                                       [1234]) iwconfig "$ifname" enc "[$key]";;
+                                       *) iwconfig "$ifname" enc "$key";;
+                               esac
+                       ;;
+                       PSK|psk|PSK2|psk2)
+                               config_get key "$vif" key
                        ;;
                esac
 
                case "$mode" in
                        ;;
                esac
 
                case "$mode" in
-                       wds)
+                       adhoc|ahdemo)
                                config_get addr "$vif" bssid
                                config_get addr "$vif" bssid
-                               iwpriv "$ifname" wds_add "$addr"
+                               [ -z "$addr" ] || { 
+                                       iwconfig "$ifname" ap "$addr"
+                               }
+                       ;;
+               esac
+               config_get ssid "$vif" ssid
+
+               config_get_bool bgscan "$vif" bgscan
+               [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan"
+
+               config_get_bool antdiv "$device" diversity
+               [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&-
+
+               config_get antrx "$device" rxantenna
+               [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&-
+
+               config_get anttx "$device" txantenna
+               [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&-
+
+               config_get distance "$device" distance
+               [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&-
+
+               config_get txpwr "$vif" txpower
+               [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}"
+
+               config_get rate "$vif" rate
+               [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}"
+
+               config_get mcast_rate "$vif" mcast_rate
+               [ -n "$mcast_rate" ] && iwpriv "$ifname" mcast_rate "${mcast_rate%%.*}"
+
+               config_get frag "$vif" frag
+               [ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}"
+
+               config_get rts "$vif" rts
+               [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}"
+
+               config_get_bool comp "$vif" compression
+               [ -n "$comp" ] && iwpriv "$ifname" compression "$comp"
+
+               config_get_bool minrate "$vif" minrate
+               [ -n "$minrate" ] && iwpriv "$ifname" minrate "$minrate"
+
+               config_get_bool maxrate "$vif" maxrate
+               [ -n "$maxrate" ] && iwpriv "$ifname" maxrate "$maxrate"
+
+               config_get_bool burst "$vif" bursting
+               [ -n "$burst" ] && iwpriv "$ifname" burst "$burst"
+
+               config_get_bool wmm "$vif" wmm
+               [ -n "$wmm" ] && iwpriv "$ifname" wmm "$wmm"
+
+               config_get_bool xr "$vif" xr
+               [ -n "$xr" ] && iwpriv "$ifname" xr "$xr"
+
+               config_get_bool ar "$vif" ar
+               [ -n "$ar" ] && iwpriv "$ifname" ar "$ar"
+
+               config_get_bool turbo "$vif" turbo
+               [ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo"
+
+               config_get_bool doth "$vif" doth 0
+               [ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
+
+               config_get maclist "$vif" maclist
+               [ -n "$maclist" ] && {
+                       # flush MAC list
+                       iwpriv "$ifname" maccmd 3
+                       for mac in $maclist; do
+                               iwpriv "$ifname" addmac "$mac"
+                       done
+               }
+
+               config_get macpolicy "$vif" macpolicy
+               case "$macpolicy" in
+                       allow)
+                               iwpriv "$ifname" maccmd 1
+                       ;;
+                       deny)
+                               iwpriv "$ifname" maccmd 2
                        ;;
                        *)
                        ;;
                        *)
-                               config_get ssid "$vif" ssid
+                               # default deny policy if mac list exists
+                               [ -n "$maclist" ] && iwpriv "$ifname" maccmd 2
                        ;;
                esac
                        ;;
                esac
+
                ifconfig "$ifname" up
                ifconfig "$ifname" up
-               
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
@@ -148,18 +254,31 @@ enable_atheros() {
                        start_net "$ifname" "$net_cfg"
                }
                iwconfig "$ifname" essid "$ssid"
                        start_net "$ifname" "$net_cfg"
                }
                iwconfig "$ifname" essid "$ssid"
+               set_wifi_up "$vif" "$ifname"
                case "$mode" in
                        ap)
                case "$mode" in
                        ap)
-                               hostapd_setup_vif "$vif" madwifi || {
-                                       echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2
-                                       # make sure this wifi interface won't accidentally stay open without encryption
-                                       ifconfig "$ifname" down
-                                       wlanconfig "$ifname" destroy
-                                       continue
-                               }
+                               config_get_bool isolate "$vif" isolate 0
+                               iwpriv "$ifname" ap_bridge "$((isolate^1))"
+
+                               if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then
+                                       hostapd_setup_vif "$vif" madwifi || {
+                                               echo "enable_atheros($device): Failed to set up hostapd for interface $ifname" >&2
+                                               # make sure this wifi interface won't accidentally stay open without encryption
+                                               ifconfig "$ifname" down
+                                               wlanconfig "$ifname" destroy
+                                               continue
+                                       }
+                               fi
                        ;;
                        wds|sta)
                        ;;
                        wds|sta)
-                               # FIXME: implement wpa_supplicant calls here
+                               if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+                                       wpa_supplicant_setup_vif "$vif" madwifi || {
+                                               echo "enable_atheros($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+                                               ifconfig "$ifname" down
+                                               wlanconfig "$ifname" destroy
+                                               continue
+                                       }
+                               fi
                        ;;
                esac
                first=0
                        ;;
                esac
                first=0
@@ -170,23 +289,23 @@ enable_atheros() {
 detect_atheros() {
        cd /proc/sys/dev
        [ -d ath ] || return
 detect_atheros() {
        cd /proc/sys/dev
        [ -d ath ] || return
-       for dev in wifi*; do
+       for dev in $(ls -d wifi* 2>&-); do
                config_get type "$dev" type
                [ "$type" = atheros ] && return
                cat <<EOF
 config wifi-device  $dev
        option type     atheros
                config_get type "$dev" type
                [ "$type" = atheros ] && return
                cat <<EOF
 config wifi-device  $dev
        option type     atheros
-       option channel  5
+       option channel  auto
+
+       # REMOVE THIS LINE TO ENABLE WIFI:
+       option disabled 1
 
 config wifi-iface
 
 config wifi-iface
-       option device   $dev
-#      option network  lan
-       option mode     ap
-       option ssid     OpenWrt
-       option hidden   0
+       option device   $dev
+       option network  lan
+       option mode     ap
+       option ssid     OpenWrt
        option encryption none
        option encryption none
-
 EOF
        done
 }
 EOF
        done
 }
-
Personal OpenWRT clone
This page took 0.042901 seconds and 4 git commands to generate.