X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;h=1ad3eb5086a5dc902ffaa4170c50437af15c4604;hp=4b254289d0d8f1f7ab341dcb01a4903fca5afa23;hb=bd93518c7bf055677fea8b489d1da76f9038f58b;hpb=83b3afb1c9a3bd8cd6a0fbfcff8008403ff5dfad diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index 4b254289d0..1ad3eb5086 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -6,8 +6,6 @@ mac80211_hostapd_setup_base() { 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 @@ -50,24 +48,6 @@ mac80211_hostapd_setup_base() { config_get_bool country_ie "$device" country_ie "$country_ie" [ "$country_ie" -gt 0 ] && append base_cfg "ieee80211d=1" "$N" - 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 - } - local br brval brstr [ -n "$basic_rate_list" ] && { for br in $basic_rate_list; do @@ -76,7 +56,7 @@ mac80211_hostapd_setup_base() { brstr="$brstr$brval" done } - + cat >> "$cfgfile" </dev/null); do - [ "$macaddr" = "$(cat /sys/class/ieee80211/${phy}/macaddress)" ] || continue - config_set "$device" phy "$phy" - break + [ -n "$macaddr" ] && { + for _phy in $(ls /sys/class/ieee80211 2>/dev/null); do + [ "$macaddr" = "$(cat /sys/class/ieee80211/${_phy}/macaddress)" ] || continue + phy="$_phy" + return done - config_get phy "$device" phy } + phy= + return +} + +find_mac80211_phy() { + local device="$1" + + config_get phy "$device" phy + lookup_phy [ -n "$phy" -a -d "/sys/class/ieee80211/$phy" ] || { echo "PHY for wifi device $1 not found" return 1 } + config_set "$device" phy "$phy" + + config_get macaddr "$device" macaddr [ -z "$macaddr" ] && { config_set "$device" macaddr "$(cat /sys/class/ieee80211/${phy}/macaddress)" } + return 0 } @@ -262,11 +262,27 @@ disable_mac80211() ( return 0 ) + get_freq() { local phy="$1" local chan="$2" iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}' } + +mac80211_generate_mac() { + local off="$1" + local mac="$2" + local oIFS="$IFS"; IFS=":"; set -- $mac; IFS="$oIFS" + + local b2mask=0x00 + [ $off -gt 0 ] && b2mask=0x02 + + printf "%02x:%s:%s:%s:%02x:%02x" \ + $(( 0x$1 | $b2mask )) $2 $3 $4 \ + $(( (0x$5 + ($off / 0x100)) % 0x100 )) \ + $(( (0x$6 + $off) % 0x100 )) +} + enable_mac80211() { local device="$1" config_get channel "$device" channel @@ -276,6 +292,7 @@ enable_mac80211() { config_get distance "$device" distance config_get txantenna "$device" txantenna all config_get rxantenna "$device" rxantenna all + config_get antenna_gain "$device" antenna_gain 0 config_get frag "$device" frag config_get rts "$device" rts find_mac80211_phy "$device" || return 0 @@ -286,15 +303,23 @@ enable_mac80211() { fixed="" local hostapd_ctrl="" - config_get ath9k_chanbw "$device" ath9k_chanbw - [ -n "$ath9k_chanbw" -a -d /sys/kernel/debug/ieee80211/$phy/ath9k ] && echo "$ath9k_chanbw" > /sys/kernel/debug/ieee80211/$phy/ath9k/chanbw + [ -n "$country" ] && { + iw reg get | grep -q "^country $country:" || { + iw reg set "$country" + sleep 1 + } + } + + config_get chanbw "$device" chanbw + [ -n "$chanbw" -a -d /sys/kernel/debug/ieee80211/$phy/ath9k ] && echo "$chanbw" > /sys/kernel/debug/ieee80211/$phy/ath9k/chanbw + [ -n "$chanbw" -a -d /sys/kernel/debug/ieee80211/$phy/ath5k ] && echo "$chanbw" > /sys/kernel/debug/ieee80211/$phy/ath5k/bwmode - [ -n "$country" ] && iw reg set "$country" [ "$channel" = "auto" -o "$channel" = "0" ] || { fixed=1 } iw phy "$phy" set antenna $txantenna $rxantenna >/dev/null 2>&1 + iw phy "$phy" set antenna_gain $antenna_gain [ -n "$distance" ] && iw phy "$phy" set distance "$distance" [ -n "$frag" ] && iw phy "$phy" set frag "${frag%%.*}" @@ -306,13 +331,9 @@ enable_mac80211() { wifi_fixup_hwmode "$device" "g" for vif in $vifs; do - while [ -d "/sys/class/net/wlan$i" ]; do - i=$(($i + 1)) - done - config_get ifname "$vif" ifname [ -n "$ifname" ] || { - ifname="wlan$i" + [ $i -gt 0 ] && ifname="wlan${phy#phy}-$i" || ifname="wlan${phy#phy}" } config_set "$vif" ifname "$ifname" @@ -328,7 +349,6 @@ enable_mac80211() { # 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) @@ -345,7 +365,7 @@ enable_mac80211() { iw phy "$phy" interface add "$ifname" type managed $wdsflag config_get_bool powersave "$vif" powersave 0 [ "$powersave" -gt 0 ] && powersave="on" || powersave="off" - iwconfig "$ifname" power "$powersave" + iw "$ifname" set power_save "$powersave" ;; esac @@ -353,17 +373,9 @@ enable_mac80211() { # which can either be explicitly set in the device # section, or automatically generated config_get macaddr "$device" macaddr - local mac_1="${macaddr%%:*}" - local mac_2="${macaddr#*:}" - config_get vif_mac "$vif" macaddr [ -n "$vif_mac" ] || { - if [ "$macidx" -gt 0 ]; then - offset="$(( 2 + $macidx * 4 ))" - else - offset="0" - fi - vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2" + vif_mac="$(mac80211_generate_mac $macidx $macaddr)" macidx="$(($macidx + 1))" } [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac" @@ -384,11 +396,7 @@ enable_mac80211() { [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" fi - 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" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00" + i=$(($i + 1)) done local start_hostapd= @@ -419,85 +427,99 @@ enable_mac80211() { for vif in $vifs; do config_get mode "$vif" mode config_get ifname "$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 beacon_int "$device" beacon_int - config_get basic_rate_list "$device" basic_rate - 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 br brval brsub brstr - [ -n "$basic_rate_list" ] && { - for br in $basic_rate_list; do - brval="$(($br / 1000))" - brsub="$((($br / 100) % 10))" - [ "$brsub" -gt 0 ] && brval="$brval.$brsub" - [ -n "$brstr" ] && brstr="$brstr," - brstr="$brstr$brval" - done - } - - local mcval="" - [ -n "$mcast_rate" ] && { - mcval="$(($mcast_rate / 1000))" - mcsub="$(( ($mcast_rate / 100) % 10 ))" - [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub" - } + [ "$mode" = "ap" ] || ifconfig "$ifname" up - config_get htmode "$device" htmode - case "$htmode" in - HT20|HT40+|HT40-) ;; - *) htmode= ;; - esac + 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" ] || iw dev "$ifname" set txpower fixed "${txpower%%.*}00" - iw dev "$ifname" ibss join "$ssid" $freq $htmode \ - ${fixed:+fixed-freq} $bssid \ - ${beacon_int:+beacon-interval $beacon_int} \ - ${brstr:+basic-rates $brstr} \ - ${mcval:+mcast-rate $mcval} \ - ${keyspec:+keys $keyspec} - ;; - sta) + case "$mode" in + adhoc) + config_get bssid "$vif" bssid + config_get ssid "$vif" ssid + config_get beacon_int "$device" beacon_int + config_get basic_rate_list "$device" basic_rate + config_get encryption "$vif" encryption + config_get key "$vif" key 1 + config_get mcast_rate "$vif" mcast_rate + config_get htmode "$device" htmode + case "$htmode" in + HT20|HT40+|HT40-) ;; + *) htmode= ;; + esac + + + local keyspec="" + [ "$encryption" == "psk" -o "$encryption" == "psk2" ] && { if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then - wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" || { + wpa_supplicant_setup_vif "$vif" nl80211 "${hostapd_ctrl:+-H $hostapd_ctrl}" $freq $htmode || { 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 } + mac80211_start_vif "$vif" "$ifname" + continue fi - ;; - esac - mac80211_start_vif "$vif" "$ifname" - fi + } + + [ "$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 br brval brsub brstr + [ -n "$basic_rate_list" ] && { + for br in $basic_rate_list; do + brval="$(($br / 1000))" + brsub="$((($br / 100) % 10))" + [ "$brsub" -gt 0 ] && brval="$brval.$brsub" + [ -n "$brstr" ] && brstr="$brstr," + brstr="$brstr$brval" + done + } + + 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 $htmode \ + ${fixed:+fixed-freq} $bssid \ + ${beacon_int:+beacon-interval $beacon_int} \ + ${brstr:+basic-rates $brstr} \ + ${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 + [ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname" done } @@ -550,12 +572,20 @@ detect_mac80211() { } iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; } + if [ -x /usr/bin/readlink ]; then + path="$(readlink -f /sys/class/ieee80211/${dev}/device)" + path="${path##/sys/devices/}" + dev_id=" option path '$path'" + else + dev_id=" option macaddr $(cat /sys/class/ieee80211/${dev}/macaddress)" + fi + cat <