add ssize_t definition to site files, fix up size for x86_64

[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 27164cc..9d08e1f 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
-                       adhoc|ahdemo|sta|ap)
+                       adhoc|ahdemo|sta|ap|monitor)
                                append $mode "$vif"
                        ;;
                        wds)
-                               config_get addr "$vif" bssid
                                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;;
@@ -43,7 +42,7 @@ scan_atheros() {
                *) echo "$device: Invalid mode combination in config"; return 1;;
        esac
 
-       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
+       config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
 }
 
 
@@ -74,7 +73,9 @@ enable_atheros() {
        local device="$1"
        config_get channel "$device" channel
        config_get vifs "$device" vifs
-       
+
+       [ auto = "$channel" ] && channel=0
+
        local first=1
        for vif in $vifs; do
                nosbeacon=
@@ -95,6 +96,8 @@ enable_atheros() {
                [ "$first" = 1 ] && {
                        # only need to change freq band and channel on the first vif
                        config_get agmode "$device" agmode
+                       [ -z "$agmode" ] && config_get agmode "$device" mode
+
                        pureg=0
                        case "$agmode" in
                                *b) agmode=11b;;
@@ -103,9 +106,6 @@ enable_atheros() {
                                *a) agmode=11a;;
                                *) agmode=auto;;
                        esac
-                       iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-                       ifconfig "$ifname" up
-                       sleep 1
                        iwpriv "$ifname" mode "$agmode"
                        iwpriv "$ifname" pureg "$pureg"
                        iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
@@ -126,6 +126,11 @@ enable_atheros() {
                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)
@@ -146,10 +151,6 @@ enable_atheros() {
                esac
 
                case "$mode" in
-                       wds)
-                               config_get addr "$vif" bssid
-                               iwpriv "$ifname" wds_add "$addr"
-                       ;;
                        adhoc|ahdemo)
                                config_get addr "$vif" bssid
                                [ -z "$addr" ] || { 
@@ -180,24 +181,42 @@ enable_atheros() {
                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 doth "$vif" 80211h
-               [ -n "$doth" ] && iwpriv "$ifname" doth "$doth"
-
                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
@@ -222,8 +241,6 @@ enable_atheros() {
                esac
 
                ifconfig "$ifname" up
-               iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null 
-
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
@@ -249,27 +266,34 @@ enable_atheros() {
                                fi
                        ;;
                        wds|sta)
-                               case "$enc" in 
+                               config_get_bool usepassphrase "$vif" passphrase 1
+                               case "$enc" in
                                        PSK|psk|PSK2|psk2)
                                                case "$enc" in
                                                        PSK|psk)
                                                                proto='proto=WPA'
-                                                               passphrase="${key}"
+                                                               if [ "$usepassphrase" = "1" ]; then
+                                                                       passphrase="psk=\"${key}\""
+                                                               else
+                                                                       passphrase="psk=${key}"
+                                                               fi
                                                                ;;
                                                        PSK2|psk2)
                                                                proto='proto=RSN'
-                                                               passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+                                                                if [ "$usepassphrase" = "1" ]; then
+                                                                        passphrase="psk=\"${key}\""
+                                                                else
+                                                                        passphrase="psk=${key}"
+                                                                fi
                                                                ;;
                                                esac
-                                               
                                                cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
-ctrl_interface=/var/run/wpa_supplicant
 network={
        scan_ssid=1
        ssid="$ssid"
        key_mgmt=WPA-PSK
        $proto
-       psk="$passphrase"
+       $passphrase
 }
 EOF
                                        ;;
@@ -277,7 +301,7 @@ EOF
                                                #add wpa_supplicant calls here
                                        ;;
                                esac
-                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+                               [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
                        ;;
                esac
                first=0
@@ -294,7 +318,7 @@ detect_atheros() {
                cat <<EOF
 config wifi-device  $dev
        option type     atheros
-       option channel  5
+       option channel  auto
 
        # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1