projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
uClibc: fix version check for 0.9.32
[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index b3072b7..13d6584 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -6,10 +6,14 @@ mac80211_hostapd_setup_base() {
        local ifname="$2"
 
        cfgfile="/var/run/hostapd-$phy.conf"
        local ifname="$2"
 
        cfgfile="/var/run/hostapd-$phy.conf"
+       macfile="/var/run/hostapd-$phy.maclist"
+       [ -e "$macfile" ] && rm -f "$macfile"
+
        config_get device "$vif" device
        config_get country "$device" country
        config_get hwmode "$device" hwmode
        config_get channel "$device" channel
        config_get device "$vif" device
        config_get country "$device" country
        config_get hwmode "$device" hwmode
        config_get channel "$device" channel
+       config_get_bool noscan "$device" noscan
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        [ "$channel" = auto ] && channel=
        [ -n "$hwmode" ] && {
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        [ "$channel" = auto ] && channel=
        [ -n "$hwmode" ] && {
@@ -29,10 +33,27 @@ mac80211_hostapd_setup_base() {
                        [ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N"
                }
        }
                        [ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N"
                }
        }
-       cat > "$cfgfile" <<EOF
+
+       config_get macfilter "$vif" macfilter
+       case "$macfilter" in
+               allow)
+                       append base_cfg "macaddr_acl=1" "$N"
+                       append base_cfg "accept_mac_file=$macfile" "$N"
+                       ;;
+               deny)
+                       append base_cfg "macaddr_acl=0" "$N"
+                       append base_cfg "deny_mac_file=$macfile" "$N"
+                       ;;
+       esac
+       config_get maclist "$vif" maclist
+       [ -n "$maclist" ] && {
+               for mac in $maclist; do
+                       echo "$mac" >> $macfile
+               done
+       }
+       cat >> "$cfgfile" <<EOF
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211
 ctrl_interface=/var/run/hostapd-$phy
 driver=nl80211
-wmm_enabled=1
 wmm_ac_bk_cwmin=4
 wmm_ac_bk_cwmax=10
 wmm_ac_bk_aifs=7
 wmm_ac_bk_cwmin=4
 wmm_ac_bk_cwmax=10
 wmm_ac_bk_aifs=7
@@ -72,6 +93,7 @@ tx_queue_data0_burst=1.5
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 ${country:+country_code=$country}
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 ${country:+country_code=$country}
+${noscan:+noscan=$noscan}
 $base_cfg
 
 EOF
 $base_cfg
 
 EOF
@@ -102,12 +124,17 @@ mac80211_hostapd_setup_bss() {
        config_get_bool wds "$vif" wds 0
        [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 
        config_get_bool wds "$vif" wds 0
        [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
 
+       local macaddr hidden maxassoc wmm
        config_get macaddr "$vif" macaddr
        config_get macaddr "$vif" macaddr
+       config_get maxassoc "$vif" maxassoc
        config_get_bool hidden "$vif" hidden 0
        config_get_bool hidden "$vif" hidden 0
+       config_get_bool wmm "$vif" wmm 1
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg
+wmm_enabled=$wmm
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
 bssid=$macaddr
 ignore_broadcast_ssid=$hidden
+${maxassoc:+max_num_sta=$maxassoc}
 EOF
 }
 
 EOF
 }
 
@@ -163,6 +190,14 @@ scan_mac80211() {
        config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${monitor:+$monitor }${mesh:+$mesh}"
 }
 
        config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${monitor:+$monitor }${mesh:+$mesh}"
 }
 
+list_phy_interfaces() {
+       local phy="$1"
+       if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then
+               ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null;
+       else
+               ls "/sys/class/ieee80211/${phy}/device" 2>/dev/null | grep net: | sed -e 's,net:,,g'
+       fi
+}
 
 disable_mac80211() (
        local device="$1"
 
 disable_mac80211() (
        local device="$1"
@@ -173,13 +208,18 @@ disable_mac80211() (
        set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that
        # are running on atheros/mac80211 vifs
        set_wifi_down "$device"
        # kill all running hostapd and wpa_supplicant processes that
        # are running on atheros/mac80211 vifs
-       for pid in `pidof hostapd wpa_supplicant`; do
-               grep "$phy" /proc/$pid/cmdline >/dev/null && \
+       for pid in `pidof hostapd`; do
+               grep -E "$phy" /proc/$pid/cmdline >/dev/null && \
                        kill $pid
        done
 
        include /lib/network
                        kill $pid
        done
 
        include /lib/network
-       for wdev in $(ls /sys/class/ieee80211/${phy}/device/net 2>/dev/null); do
+       for wdev in $(list_phy_interfaces "$phy"); do
+               [ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1
+               for pid in `pidof wpa_supplicant`; do
+                       grep "$wdev" /proc/$pid/cmdline >/dev/null && \
+                               kill $pid
+               done
                ifconfig "$wdev" down 2>/dev/null
                unbridge "$dev"
                iw dev "$wdev" del
                ifconfig "$wdev" down 2>/dev/null
                unbridge "$dev"
                iw dev "$wdev" del
@@ -199,19 +239,28 @@ enable_mac80211() {
        config_get txpower "$device" txpower
        config_get country "$device" country
        config_get distance "$device" distance
        config_get txpower "$device" txpower
        config_get country "$device" country
        config_get distance "$device" distance
+       config_get txantenna "$device" txantenna all
+       config_get rxantenna "$device" rxantenna all
+       config_get frag "$device" frag
+       config_get rts "$device" rts
        find_mac80211_phy "$device" || return 0
        config_get phy "$device" phy
        local i=0
        local macidx=0
        local apidx=0
        fixed=""
        find_mac80211_phy "$device" || return 0
        config_get phy "$device" phy
        local i=0
        local macidx=0
        local apidx=0
        fixed=""
+       local hostapd_ctrl=""
 
        [ -n "$country" ] && iw reg set "$country"
        [ "$channel" = "auto" -o "$channel" = "0" ] || {
                fixed=1
        }
 
 
        [ -n "$country" ] && iw reg set "$country"
        [ "$channel" = "auto" -o "$channel" = "0" ] || {
                fixed=1
        }
 
+       iw phy "$phy" set antenna $txantenna $rxantenna
+
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
        [ -n "$distance" ] && iw phy "$phy" set distance "$distance"
+       [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}"
+       [ -n "$rts" ] && iw phy "$phy" set rts "${rts%%.*}"
 
        export channel fixed
        # convert channel to frequency
 
        export channel fixed
        # convert channel to frequency
@@ -229,7 +278,6 @@ enable_mac80211() {
                }
                config_set "$vif" ifname "$ifname"
 
                }
                config_set "$vif" ifname "$ifname"
 
-               config_get enc "$vif" encryption
                config_get mode "$vif" mode
                config_get ssid "$vif" ssid
 
                config_get mode "$vif" mode
                config_get ssid "$vif" ssid
 
@@ -242,6 +290,7 @@ enable_mac80211() {
                                # Hostapd will handle recreating the interface and
                                # it's accompanying monitor
                                apidx="$(($apidx + 1))"
                                # Hostapd will handle recreating the interface and
                                # it's accompanying monitor
                                apidx="$(($apidx + 1))"
+                               i=$(($i + 1))
                                [ "$apidx" -gt 1 ] || iw phy "$phy" interface add "$ifname" type managed
                        ;;
                        mesh)
                                [ "$apidx" -gt 1 ] || iw phy "$phy" interface add "$ifname" type managed
                        ;;
                        mesh)
@@ -282,121 +331,26 @@ enable_mac80211() {
                [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"
                config_set "$vif" macaddr "$vif_mac"
 
                [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac"
                config_set "$vif" macaddr "$vif_mac"
 
-               # Valid values are:
-               # wpa / wep / none
-               #
                # !! ap !!
                #
                # ALL ap functionality will be passed to hostapd
                #
                # !! ap !!
                #
                # ALL ap functionality will be passed to hostapd
                #
-               # !! mesh / adhoc / station !!
-               # none -> NO encryption
+               # !! station !!
                #
                #
-               # wep + keymgmt = '' -> we use iw to connect to the
-               # network.
+               # ALL station functionality will be passed to wpa_supplicant
                #
                #
-               # wep + keymgmt = 'NONE' -> wpa_supplicant will be
-               # configured to handle the wep connection
                if [ ! "$mode" = "ap" ]; then
                        # We attempt to set the channel for all interfaces, although
                        # mac80211 may not support it or the driver might not yet
                        # for ap mode this is handled by hostapd
                        [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
                if [ ! "$mode" = "ap" ]; then
                        # We attempt to set the channel for all interfaces, although
                        # mac80211 may not support it or the driver might not yet
                        # for ap mode this is handled by hostapd
                        [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel"
-
-                       local key keystring
-
-                       case "$enc" in
-                               *wep*)
-                                       config_get keymgmt "$vif" keymgmt
-                                       if [ -z "$keymgmt" ]; then
-                                               config_get key "$vif" key
-                                               key="${key:-1}"
-                                               case "$key" in
-                                                       [1234])
-                                                               for idx in 1 2 3 4; do
-                                                                       local zidx
-                                                                       zidx=$(($idx - 1))
-                                                                       config_get ckey "$vif" "key${idx}"
-                                                                       if [ -n "$ckey" ]; then
-                                                                               [ $idx -eq $key ] && zidx="d:${zidx}"
-                                                                               append keystring "${zidx}:$(prepare_key_wep "$ckey")"
-                                                                       fi
-                                                               done
-                                                               ;;
-                                                       *)
-                                                               keystring="d:0:$(prepare_key_wep "$key")"
-                                                               ;;
-                                               esac
-                                       fi
-                               ;;
-                               *psk*|*wpa*)
-                                       config_get key "$vif" key
-                               ;;
-                       esac
                fi
 
                fi
 
-               # txpower is not yet implemented in iw
                config_get vif_txpower "$vif" txpower
                # use vif_txpower (from wifi-iface) to override txpower (from
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
                config_get vif_txpower "$vif" txpower
                # use vif_txpower (from wifi-iface) to override txpower (from
                # wifi-device) if the latter doesn't exist
                txpower="${txpower:-$vif_txpower}"
-               [ -z "$txpower" ] || iwconfig "$ifname" txpower "${txpower%%.*}"
-
-               config_get frag "$vif" frag
-               if [ -n "$frag" ]; then
-                       iw phy "$phy" set frag "${frag%%.*}"
-               fi
-
-               config_get rts "$vif" rts
-               if [ -n "$rts" ]; then
-                       iw phy "$phy" set rts "${rts%%.*}"
-               fi
-
-               ifconfig "$ifname" up
-
-               [ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname"
-
-               case "$mode" in
-                       adhoc)
-                               config_get bssid "$vif" bssid
-                               iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
-                       ;;
-                       sta|mesh)
-                               config_get bssid "$vif" bssid
-                               case "$enc" in
-                                       *wep*)
-                                               if [ -z "$keymgmt" ]; then
-                                                       [ -n "$keystring" ] &&
-                                                               iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key $keystring
-                                               else
-                                                       if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-                                                               wpa_supplicant_setup_vif "$vif" wext || {
-                                                                       echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
-                                                                       # make sure this wifi interface won't accidentally stay open without encryption
-                                                                       ifconfig "$ifname" down
-                                                                       continue
-                                                               }
-                                                       fi
-                                               fi
-                                       ;;
-                                       *wpa*|*psk*)
-                                               config_get key "$vif" key
-                                               if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-                                                       wpa_supplicant_setup_vif "$vif" wext || {
-                                                               echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
-                                                               # make sure this wifi interface won't accidentally stay open without encryption
-                                                               ifconfig "$ifname" down
-                                                               continue
-                                                       }
-                                               fi
-                                       ;;
-                                       *)
-                                               iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid
-                                       ;;
-                               esac
-
-                       ;;
-               esac
+               [ -z "$txpower" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00"
        done
 
        local start_hostapd=
        done
 
        local start_hostapd=
@@ -408,20 +362,89 @@ enable_mac80211() {
                start_hostapd=1
        done
 
                start_hostapd=1
        done
 
-       [ -n "$start_hostapd" ] || return
-
-       hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
-               echo "Failed to start hostapd for $phy"
-               return
+       [ -n "$start_hostapd" ] && {
+               hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
+                       echo "Failed to start hostapd for $phy"
+                       return
+               }
+               sleep 2
+
+               for vif in $vifs; do
+                       config_get mode "$vif" mode
+                       config_get ifname "$vif" ifname
+                       [ "$mode" = "ap" ] || continue
+                       hostapd_ctrl="${hostapd_ctrl:-/var/run/hostapd-$phy/$ifname}"
+                       mac80211_start_vif "$vif" "$ifname"
+               done
        }
        }
-       sleep 2
 
        for vif in $vifs; do
                config_get mode "$vif" mode
                config_get ifname "$vif" ifname
 
        for vif in $vifs; do
                config_get mode "$vif" mode
                config_get ifname "$vif" ifname
-               [ "$mode" = "ap" ] || continue
-               mac80211_start_vif "$vif" "$ifname"
+               [ ! "$mode" = "ap" ] || continue
+               ifconfig "$ifname" up
+
+               if [ ! "$mode" = "ap" ]; then
+                       ifconfig "$ifname" up
+                       case "$mode" in
+                               adhoc)
+                                       config_get bssid "$vif" bssid
+                                       config_get ssid "$vif" ssid
+                                       config_get bintval "$vif" bintval
+                                       config_get basicrates "$vif" basicrates
+                                       config_get encryption "$vif" encryption
+                                       config_get key "$vif" key 1
+                                       config_get mcast_rate "$vif" mcast_rate
+
+                                       local keyspec=""
+                                       [ "$encryption" == "wep" ] && {
+                                               case "$key" in
+                                                       [1234])
+                                                               local idx
+                                                               for idx in 1 2 3 4; do
+                                                                       local ikey
+                                                                       config_get ikey "$vif" "key$idx"
+
+                                                                       [ -n "$ikey" ] && {
+                                                                               ikey="$(($idx - 1)):$(prepare_key_wep "$ikey")"
+                                                                               [ $idx -eq $key ] && ikey="d:$ikey"
+                                                                               append keyspec "$ikey"
+                                                                       }
+                                                               done
+                                                       ;;
+                                                       *) append keyspec "d:0:$(prepare_key_wep "$key")" ;;
+                                               esac
+                                       }
+
+                                       local mcval=""
+                                       [ -n "$mcast_rate" ] && {
+                                               mcval="$(($mcast_rate / 1000))"
+                                               mcsub="$(( ($mcast_rate / 100) % 10 ))"
+                                               [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
+                                       }
+
+                                       iw dev "$ifname" ibss join "$ssid" $freq \
+                                               ${fixed:+fixed-freq} $bssid \
+                                               ${bintval:+beacon-interval $bintval} \
+                                               ${basicrates:+basic-rates $basicrates} \
+                                               ${mcval:+mcast-rate $mcval} \
+                                               ${keyspec:+keys $keyspec}
+                               ;;
+                               sta)
+                                       if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
+                                               wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" || {
+                                                       echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
+                                                       # make sure this wifi interface won't accidentally stay open without encryption
+                                                       ifconfig "$ifname" down
+                                                       continue
+                                               }
+                                       fi
+                               ;;
+                       esac
+                       mac80211_start_vif "$vif" "$ifname"
+               fi
        done
        done
+
 }
 
 
 }
 
 
@@ -449,7 +472,7 @@ detect_mac80211() {
 
                mode_11n=""
                mode_band="g"
 
                mode_11n=""
                mode_band="g"
-               channel="5"
+               channel="11"
                ht_cap=0
                for cap in $(iw phy "$dev" info | grep 'Capabilities:' | cut -d: -f2); do
                        ht_cap="$(($ht_cap | $cap))"
                ht_cap=0
                for cap in $(iw phy "$dev" info | grep 'Capabilities:' | cut -d: -f2); do
                        ht_cap="$(($ht_cap | $cap))"
@@ -461,8 +484,13 @@ detect_mac80211() {
 
                        list="  list ht_capab"
                        [ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list  LDPC" "$N"
 
                        list="  list ht_capab"
                        [ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list  LDPC" "$N"
+                       [ "$(($ht_cap & 16))" -eq 16 ] && append ht_capab "$list        GF" "$N"
                        [ "$(($ht_cap & 32))" -eq 32 ] && append ht_capab "$list        SHORT-GI-20" "$N"
                        [ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list        SHORT-GI-40" "$N"
                        [ "$(($ht_cap & 32))" -eq 32 ] && append ht_capab "$list        SHORT-GI-20" "$N"
                        [ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list        SHORT-GI-40" "$N"
+                       [ "$(($ht_cap & 128))" -eq 128 ] && append ht_capab "$list      TX-STBC" "$N"
+                       [ "$(($ht_cap & 768))" -eq 256 ] && append ht_capab "$list      RX-STBC1" "$N"
+                       [ "$(($ht_cap & 768))" -eq 512 ] && append ht_capab "$list      RX-STBC12" "$N"
+                       [ "$(($ht_cap & 768))" -eq 768 ] && append ht_capab "$list      RX-STBC123" "$N"
                        [ "$(($ht_cap & 4096))" -eq 4096 ] && append ht_capab "$list    DSSS_CCK-40" "$N"
                }
                iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
                        [ "$(($ht_cap & 4096))" -eq 4096 ] && append ht_capab "$list    DSSS_CCK-40" "$N"
                }
                iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
Personal OpenWRT clone
This page took 0.029742 seconds and 4 git commands to generate.