htc_vht \
rx_antenna_pattern \
tx_antenna_pattern
- config_add_int vht_max_mpdu vht_max_rx_stbc vht_link_adapt vht160
+ config_add_int vht_max_a_mpdu_len_exp vht_max_mpdu vht_link_adapt vht160 rx_stbc tx_stbc
+ config_add_boolean \
+ ldpc \
+ greenfield \
+ short_gi_20 \
+ short_gi_40 \
+ dsss_cck_40
}
drv_mac80211_init_iface_config() {
config_add_boolean wds powersave
config_add_int maxassoc
config_add_int max_listen_int
- config_add_int dtim_interval
+ config_add_int dtim_period
# mesh
config_add_string mesh_id
config_add_string $MP_CONFIG_STRING
}
+mac80211_add_capabilities() {
+ local __var="$1"; shift
+ local __mask="$1"; shift
+ local __out= oifs
+
+ oifs="$IFS"
+ IFS=:
+ for capab in "$@"; do
+ set -- $capab
+
+ [ "$(($4))" -gt 0 ] || continue
+ [ "$(($__mask & $2))" -eq "$((${3:-$2}))" ] || continue
+ __out="$__out[$1]"
+ done
+ IFS="$oifs"
+
+ export -n -- "$__var=$__out"
+}
+
mac80211_hostapd_setup_base() {
local phy="$1"
[ "$auto_channel" -gt 0 ] && channel=acs_survey
- [ "$enable_ht" -gt 0 ] && {
- json_get_vars noscan htmode
- json_get_values ht_capab_list ht_capab
+ json_get_vars noscan htmode
+ json_get_values ht_capab_list ht_capab
+
+ ieee80211n=1
+ ht_capab=
+ case "$htmode" in
+ VHT20|HT20) ;;
+ HT40*|VHT40|VHT80|VHT160)
+ case "$hwmode" in
+ a)
+ case "$(( ($channel / 4) % 2 ))" in
+ 1) ht_capab="[HT40+]";;
+ 0) ht_capab="[HT40-]";;
+ esac
+ ;;
+ *)
+ case "$htmode" in
+ HT40+) ht_capab="[HT40+]";;
+ HT40-) ht_capab="[HT40-]";;
+ *)
+ if [ "$channel" -lt 7 ]; then
+ ht_capab="[HT40+]"
+ else
+ ht_capab="[HT40-]"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ [ "$auto_channel" -gt 0 ] && ht_capab="[HT40+]"
+ ;;
+ *) ieee80211n= ;;
+ esac
+ [ -n "$ieee80211n" ] && {
append base_cfg "ieee80211n=1" "$N"
- ht_capab=
- case "$htmode" in
- HT20|HT40-|HT40+) ht_capab="[$htmode]";;
- VHT40|VHT80|VHT160)
- case "$channel" in
- 36|44|52|60|100|108|116|124|132|140|149|157) ht_capab="[HT40+]";;
- 40|48|56|64|104|112|120|128|136|144|153|161) ht_capab="[HT40-]";;
- esac
- ;;
- esac
- for cap in $ht_capab_list; do
- ht_capab="$ht_capab[$cap]"
+ json_get_vars \
+ ldpc:1 \
+ greenfield:0 \
+ short_gi_20:1 \
+ short_gi_40:1 \
+ tx_stbc:1 \
+ rx_stbc:3 \
+ dsss_cck_40:1
+
+ ht_cap_mask=0
+ for cap in $(iw phy "$phy" info | grep 'Capabilities:' | cut -d: -f2); do
+ ht_cap_mask="$(($ht_cap_mask | $cap))"
done
+ cap_rx_stbc=$((($ht_cap_mask >> 8) & 3))
+ [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
+ ht_cap_mask="$(( ($ht_cap_mask & ~(0x300)) | ($cap_rx_stbc << 8) ))"
+
+ mac80211_add_capabilities ht_capab_flags $ht_cap_mask \
+ LDPC:0x1::$ldpc \
+ GF:0x10::$greenfield \
+ SHORT-GI-20:0x20::$short_gi_20 \
+ SHORT-GI-40:0x40::$short_gi_40 \
+ TX-STBC:0x80::$tx_stbc \
+ RX-STBC1:0x300:0x100:1 \
+ RX-STBC12:0x300:0x200:1 \
+ RX-STBC123:0x300:0x300:1 \
+ DSSS_CCK-40:0x1000::$dsss_cck_40
+
+ ht_capab="$ht_capab$ht_capab_flags"
[ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N"
+ }
- # 802.11ac
- enable_ac=0
- idx="$channel"
- case "$htmode" in
- VHT40)
- case "$channel" in
- 36|40) idx=38;;
- 44|48) idx=42;;
- 52|56) idx=54;;
- 60|64) idx=58;;
- 100|104) idx=102;;
- 108|112) idx=110;;
- 116|120) idx=118;;
- 124|128) idx=126;;
- 132|136) idx=134;;
- 140|144) idx=142;;
- 149|153) idx=151;;
- 157|161) idx=159;;
- esac
- enable_ac=1
- append base_cfg "vht_oper_chwidth=0" "$N"
- append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
- ;;
- VHT80)
- case "$channel" in
- 36|40|44|48) idx=42;;
- 52|56|60|64) idx=58;;
- 100|104|108|112) idx=106;;
- 116|120|124|128) idx=122;;
- 132|136|140|144) idx=138;;
- 149|153|157|161) idx=155;;
- esac
- enable_ac=1
- append base_cfg "vht_oper_chwidth=1" "$N"
- append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
- ;;
- VHT160)
- case "$channel" in
- 36|40|44|48|52|56|60|64) idx=50;;
- 100|104|108|112|116|120|124|128) idx=114;;
- esac
- enable_ac=1
- append base_cfg "vht_oper_chwidth=2" "$N"
- append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
- ;;
- esac
+ # 802.11ac
+ enable_ac=0
+ idx="$channel"
+ case "$htmode" in
+ VHT20) enable_ac=1;;
+ VHT40)
+ case "$(( ($channel / 4) % 2 ))" in
+ 1) idx=$(($channel + 2));;
+ 0) idx=$(($channel - 2));;
+ esac
+ enable_ac=1
+ append base_cfg "vht_oper_chwidth=0" "$N"
+ append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
+ ;;
+ VHT80)
+ case "$(( ($channel / 4) % 4 ))" in
+ 1) idx=$(($channel + 6));;
+ 2) idx=$(($channel + 2));;
+ 3) idx=$(($channel - 2));;
+ 0) idx=$(($channel - 6));;
+ esac
+ enable_ac=1
+ append base_cfg "vht_oper_chwidth=1" "$N"
+ append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
+ ;;
+ VHT160)
+ case "$channel" in
+ 36|40|44|48|52|56|60|64) idx=50;;
+ 100|104|108|112|116|120|124|128) idx=114;;
+ esac
+ enable_ac=1
+ append base_cfg "vht_oper_chwidth=2" "$N"
+ append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
+ ;;
+ esac
- if [ "$enable_ac" != "0" ]; then
- json_get_vars \
- rxldpc:1 \
- short_gi_80:1 \
- short_gi_160:1 \
- tx_stbc_2by1:1 \
- su_beamformer:1 \
- su_beamformee:1 \
- mu_beamformer:1 \
- mu_beamformee:1 \
- vht_txop_ps:1 \
- htc_vht:1 \
- rx_antenna_pattern:1 \
- tx_antenna_pattern:1 \
- vht_max_mpdu:11454 \
- vht_max_rx_stbc:4 \
- vht_link_adapt:3 \
- vht160:2
-
- append base_cfg "ieee80211ac=1" "$N"
- vht_capab=""
- vht_cap=0
- for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
- vht_cap="$(($vht_cap | $cap))"
- done
+ if [ "$enable_ac" != "0" ]; then
+ json_get_vars \
+ rxldpc:1 \
+ short_gi_80:1 \
+ short_gi_160:1 \
+ tx_stbc_2by1:1 \
+ su_beamformer:1 \
+ su_beamformee:1 \
+ mu_beamformer:1 \
+ mu_beamformee:1 \
+ vht_txop_ps:1 \
+ htc_vht:1 \
+ rx_antenna_pattern:1 \
+ tx_antenna_pattern:1 \
+ vht_max_a_mpdu_len_exp:7 \
+ vht_max_mpdu:11454 \
+ rx_stbc:4 \
+ tx_stbc:4 \
+ vht_link_adapt:3 \
+ vht160:2
+
+ append base_cfg "ieee80211ac=1" "$N"
+ vht_cap=0
+ for cap in $(iw phy "$phy" info | awk -F "[()]" '/VHT Capabilities/ { print $2 }'); do
+ vht_cap="$(($vht_cap | $cap))"
+ done
- # boolean
- [ "$((($vht_cap & 16) * $rxldpc))" -eq 16 ] && \
- vht_capab="$vht_capab[RXLDPC]"
- [ "$((($vht_cap & 32) * $short_gi_80))" -eq 32 ] && \
- vht_capab="$vht_capab[SHORT-GI-80]"
- [ "$((($vht_cap & 64) * $short_gi_160))" -eq 64 ] && \
- vht_capab="$vht_capab[SHORT-GI-160]"
- [ "$((($vht_cap & 128) * $tx_stbc_2by1))" -eq 128 ] && \
- vht_capab="$vht_capab[TX-STBC-2BY1]"
- [ "$((($vht_cap & 2048) * $su_beamformer))" -eq 2048 ] && \
- vht_capab="$vht_capab[SU-BEAMFORMER]"
- [ "$((($vht_cap & 4096) * $su_beamformee))" -eq 4096 ] && \
- vht_capab="$vht_capab[SU-BEAMFORMEE]"
- [ "$((($vht_cap & 524288) * $mu_beamformer))" -eq 524288 ] && \
- vht_capab="$vht_capab[MU-BEAMFORMER]"
- [ "$((($vht_cap & 1048576) * $mu_beamformee))" -eq 1048576 ] && \
- vht_capab="$vht_capab[MU-BEAMFORMEE]"
- [ "$((($vht_cap & 2097152) * $vht_txop_ps))" -eq 2097152 ] && \
- vht_capab="$vht_capab[VHT-TXOP-PS]"
- [ "$((($vht_cap & 4194304) * $htc_vht))" -eq 4194304 ] && \
- vht_capab="$vht_capab[HTC-VHT]"
- [ "$((($vht_cap & 268435456) * $rx_antenna_pattern))" -eq 268435456 ] && \
- vht_capab="$vht_capab[RX-ANTENNA-PATTERN]"
- [ "$((($vht_cap & 536870912) * $tx_antenna_pattern))" -eq 536870912 ] && \
- vht_capab="$vht_capab[TX-ANTENNA-PATTERN]"
-
- # supported Channel widths
- vht160_hw=0
- [ "$(($vht_cap & 12))" -eq 4 -a 1 -le "$vht160" ] && \
- vht160_hw=1
- [ "$(($vht_cap & 12))" -eq 8 -a 2 -le "$vht160" ] && \
- vht160_hw=2
- [ "$vht160_hw" = 1 ] && vht_capab="$vht_capab[VHT160]"
- [ "$vht160_hw" = 2 ] && vht_capab="$vht_capab[VHT160-80PLUS80]"
-
- # maximum MPDU length
- vht_max_mpdu_hw=3895
- [ "$(($vht_cap & 3))" -ge 1 -a 7991 -le "$vht_max_mpdu" ] && \
- vht_max_mpdu_hw=7991
- [ "$(($vht_cap & 3))" -ge 2 -a 11454 -le "$vht_max_mpdu" ] && \
- vht_max_mpdu_hw=11454
- [ "$vht_max_mpdu_hw" != 3895 ] && \
- vht_capab="$vht_capab[MAX-MPDU-$vht_max_mpdu_hw]"
-
- # support for the reception of PPDUs using STBC
- vht_max_rx_stbc_hw=0
- [ "$(($vht_cap & 1792))" -ge 256 -a 1 -le "$vht_max_rx_stbc" ] && \
- vht_max_rx_stbc_hw=1
- [ "$(($vht_cap & 1792))" -ge 512 -a 2 -le "$vht_max_rx_stbc" ] && \
- vht_max_rx_stbc_hw=2
- [ "$(($vht_cap & 1792))" -ge 768 -a 3 -le "$vht_max_rx_stbc" ] && \
- vht_max_rx_stbc_hw=3
- [ "$(($vht_cap & 1792))" -ge 1024 -a 4 -le "$vht_max_rx_stbc" ] && \
- vht_max_rx_stbc_hw=4
- [ "$vht_max_rx_stbc_hw" = 1 ] && vht_capab="$vht_capab[RX-STBC-1]"
- [ "$vht_max_rx_stbc_hw" = 2 ] && vht_capab="$vht_capab[RX-STBC-12]"
- [ "$vht_max_rx_stbc_hw" = 3 ] && vht_capab="$vht_capab[RX-STBC-123]"
- [ "$vht_max_rx_stbc_hw" = 4 ] && vht_capab="$vht_capab[RX-STBC-1234]"
-
- # whether or not the STA supports link adaptation using VHT variant
- vht_link_adapt_hw=0
- [ "$(($vht_cap & 201326592))" -ge 134217728 -a 2 -le "$vht_link_adapt" ] && \
- vht_link_adapt_hw=2
- [ "$(($vht_cap & 201326592))" -ge 201326592 -a 3 -le "$vht_link_adapt" ] && \
- vht_link_adapt_hw=3
- [ "$vht_link_adapt_hw" != 0 ] && \
- vht_capab="$vht_capab[VHT-LINK-ADAPT-$vht_link_adapt_hw]"
-
- [ -n "$vht_capab" ] && append base_cfg "vht_capab=$vht_capab" "$N"
- fi
- }
+ cap_rx_stbc=$((($vht_cap >> 8) & 7))
+ [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
+ ht_cap_mask="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
+
+ mac80211_add_capabilities vht_capab $vht_cap \
+ RXLDPC:0x10::$rxldpc \
+ SHORT-GI-80:0x20::$short_gi_80 \
+ SHORT-GI-160:0x40::$short_gi_160 \
+ TX-STBC-2BY1:0x80::$tx_stbc \
+ SU-BEAMFORMER:0x800::$su_beamformer \
+ SU-BEAMFORMEE:0x1000::$su_beamformee \
+ MU-BEAMFORMER:0x80000::$mu_beamformer \
+ MU-BEAMFORMEE:0x100000::$mu_beamformee \
+ VHT-TXOP-PS:0x200000::$vht_txop_ps \
+ HTC-VHT:0x400000::$htc_vht \
+ RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
+ TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
+ RX-STBC1:0x700:0x100:1 \
+ RX-STBC12:0x700:0x200:1 \
+ RX-STBC123:0x700:0x300:1 \
+ RX-STBC1234:0x700:0x400:1 \
+
+ # supported Channel widths
+ vht160_hw=0
+ [ "$(($vht_cap & 12))" -eq 4 -a 1 -le "$vht160" ] && \
+ vht160_hw=1
+ [ "$(($vht_cap & 12))" -eq 8 -a 2 -le "$vht160" ] && \
+ vht160_hw=2
+ [ "$vht160_hw" = 1 ] && vht_capab="$vht_capab[VHT160]"
+ [ "$vht160_hw" = 2 ] && vht_capab="$vht_capab[VHT160-80PLUS80]"
+
+ # maximum MPDU length
+ vht_max_mpdu_hw=3895
+ [ "$(($vht_cap & 3))" -ge 1 -a 7991 -le "$vht_max_mpdu" ] && \
+ vht_max_mpdu_hw=7991
+ [ "$(($vht_cap & 3))" -ge 2 -a 11454 -le "$vht_max_mpdu" ] && \
+ vht_max_mpdu_hw=11454
+ [ "$vht_max_mpdu_hw" != 3895 ] && \
+ vht_capab="$vht_capab[MAX-MPDU-$vht_max_mpdu_hw]"
+
+ # maximum A-MPDU length exponent
+ vht_max_a_mpdu_len_exp_hw=0
+ [ "$(($vht_cap & 58720256))" -ge 8388608 -a 1 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=1
+ [ "$(($vht_cap & 58720256))" -ge 16777216 -a 2 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=2
+ [ "$(($vht_cap & 58720256))" -ge 25165824 -a 3 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=3
+ [ "$(($vht_cap & 58720256))" -ge 33554432 -a 4 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=4
+ [ "$(($vht_cap & 58720256))" -ge 41943040 -a 5 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=5
+ [ "$(($vht_cap & 58720256))" -ge 50331648 -a 6 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=6
+ [ "$(($vht_cap & 58720256))" -ge 58720256 -a 7 -le "$vht_max_a_mpdu_len_exp" ] && \
+ vht_max_a_mpdu_len_exp_hw=7
+ vht_capab="$vht_capab[MAX-A-MPDU-LEN-EXP$vht_max_a_mpdu_len_exp_hw]"
+
+ # whether or not the STA supports link adaptation using VHT variant
+ vht_link_adapt_hw=0
+ [ "$(($vht_cap & 201326592))" -ge 134217728 -a 2 -le "$vht_link_adapt" ] && \
+ vht_link_adapt_hw=2
+ [ "$(($vht_cap & 201326592))" -ge 201326592 -a 3 -le "$vht_link_adapt" ] && \
+ vht_link_adapt_hw=3
+ [ "$vht_link_adapt_hw" != 0 ] && \
+ vht_capab="$vht_capab[VHT-LINK-ADAPT-$vht_link_adapt_hw]"
+
+ [ -n "$vht_capab" ] && append base_cfg "vht_capab=$vht_capab" "$N"
+ fi
hostapd_prepare_device_config "$hostapd_conf_file" nl80211
cat >> "$hostapd_conf_file" <<EOF
EOF
}
+mac80211_get_addr() {
+ local phy="$1"
+ local idx="$(($2 + 1))"
+
+ head -n $(($macidx + 1)) /sys/class/ieee80211/${phy}/addresses | tail -n1
+}
+
mac80211_generate_mac() {
local phy="$1"
local id="${macidx:-0}"
local ref="$(cat /sys/class/ieee80211/${phy}/macaddress)"
local mask="$(cat /sys/class/ieee80211/${phy}/address_mask)"
- [ "$mask" = "00:00:00:00:00:00" ] && mask="ff:ff:ff:ff:ff:ff";
+ [ "$mask" = "00:00:00:00:00:00" ] && {
+ mask="ff:ff:ff:ff:ff:ff";
+
+ [ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt 1 ] && {
+ addr="$(mac80211_get_addr "$phy" "$id")"
+ [ -n "$addr" ] && {
+ echo "$addr"
+ return
+ }
+ }
+ }
+
local oIFS="$IFS"; IFS=":"; set -- $mask; IFS="$oIFS"
local mask1=$1
find_phy() {
[ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
- [ -n "$path" -a -d "/sys/devices/$path/ieee80211" ] && {
- phy="$(ls /sys/devices/$path/ieee80211 | grep -m 1 phy)"
- [ -n "$phy" ] && return 0
+ [ -n "$path" ] && {
+ for phy in /sys/devices/$path/ieee80211/phy*; do
+ [ -e "$phy" ] && {
+ phy="${phy##*/}"
+ return 0
+ }
+ done
}
[ -n "$macaddr" ] && {
for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
json_get_vars bssid ssid key mcast_rate
keyspec=
- [ "$auth_type" == "wep" ] && {
+ [ "$auth_type" = "wep" ] && {
set_default key 1
case "$key" in
[1234])
mac80211_setup_vif() {
local name="$1"
+ local failed
json_select data
json_get_vars ifname
json_get_var mp_val "$var"
[ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
done
- # todo: authsae
+
+ # authsae
+ json_get_vars key
+ if [ -n "$key" ]; then
+ if [ -e "/lib/wifi/authsae.sh" ]; then
+ . /lib/wifi/authsae.sh
+ authsae_start_interface || failed=1
+ else
+ wireless_setup_vif_failed AUTHSAE_NOT_INSTALLED
+ json_select ..
+ return
+ fi
+ fi
;;
adhoc)
wireless_vif_parse_encryption
projects / openwrt / openwrt.git / blobdiff