WiFi 6 Support (#82)
* add options for wifi66
* rebase to 0.7.6 and upgrade version to 0.8.0-unstable0
* fix channel detection
* can_transmit_to_channel: fix 5GHz and 6GHz freq range
* can_transmit_to_channel: limit freq integer part to 4 digits
* enable wmm when wifi 6 is enabled
* lint remove stray spaces
* Revert "lint remove stray spaces"
This reverts commit 8830b95cff.
---------
Co-authored-by: garywill <garywill@disroot.org>
Co-authored-by: Phani Pavan K <kphanipavan+goose@gmail.com>
This commit is contained in:
Phani Pavan Kambhampati
GitHub
parent
94949ba40b
commit
b6fe527472
90
lnxrouter
90
lnxrouter
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
VERSION=0.7.6
|
||||
VERSION=0.8.0-unstable1
|
||||
PROGNAME="$(basename "$0")"
|
||||
|
||||
export LC_ALL=C
|
||||
|
|
@ -123,7 +123,21 @@ Options:
|
|||
segment. Use with '--vht-ch-width'
|
||||
--vht-seg1-ch <channel> Channel index of VHT center frequency for secondary
|
||||
(second 80MHz) segment. Use with '--vht-ch-width 3'
|
||||
|
||||
|
||||
WiFi 6 (802.11ax) configs:
|
||||
--wifi6 Enable IEEE 802.11ax (HE)
|
||||
--req-he Require station HE (High Efficiency) mode
|
||||
|
||||
--he-ch-width <index> Index of HE channel width:
|
||||
0 for 20MHz or 40MHz (default)
|
||||
1 for 80MHz
|
||||
2 for 160MHz
|
||||
3 for 80+80MHz (Non-contigous 160MHz)
|
||||
--he-seg0-ch <channel> Channel index of HE center frequency for primary
|
||||
segment. Use with '--he-ch-width'
|
||||
--he-seg1-ch <channel> Channel index of HE center frequency for secondary
|
||||
(second 80MHz) segment. Use with '--he-ch-width 3'
|
||||
|
||||
Instance managing:
|
||||
--daemon Run in background
|
||||
--keep-confdir Don't delete the temporary config dir after exit
|
||||
|
|
@ -199,11 +213,16 @@ define_global_variables(){
|
|||
REQUIREHT=0
|
||||
IEEE80211AC=0
|
||||
REQUIREVHT=0
|
||||
IEEE80211AX=0
|
||||
REQUIREHE=0
|
||||
HT_CAPAB='[HT40+]'
|
||||
VHT_CAPAB=
|
||||
VHTCHANNELWIDTH=0
|
||||
VHTSEG0CHINDEX=0
|
||||
VHTSEG1CHINDEX=0
|
||||
HECHANNELWIDTH=0
|
||||
HESEG0CHINDEX=0
|
||||
HESEG1CHINDEX=0
|
||||
DRIVER=nl80211
|
||||
NO_VIRT=0 # not use virtual interface
|
||||
COUNTRY=
|
||||
|
|
@ -418,6 +437,14 @@ parse_user_options(){
|
|||
shift
|
||||
IEEE80211AC=1
|
||||
;;
|
||||
--wifi6|--ieee80211ax)
|
||||
shift
|
||||
IEEE80211AX=1
|
||||
;;
|
||||
--req-he|--require-he)
|
||||
shift
|
||||
REQUIREHE=1
|
||||
;;
|
||||
--req-vht|--require-vht)
|
||||
shift
|
||||
REQUIREVHT=1
|
||||
|
|
@ -447,6 +474,21 @@ parse_user_options(){
|
|||
VHTSEG1CHINDEX="$1"
|
||||
shift
|
||||
;;
|
||||
--he-ch-width|--he-channel-width)
|
||||
shift
|
||||
HECHANNELWIDTH="$1"
|
||||
shift
|
||||
;;
|
||||
--he-seg0-ch|--he-seg0-channel)
|
||||
shift
|
||||
HESEG0CHINDEX="$1"
|
||||
shift
|
||||
;;
|
||||
--he-seg1-ch|--he-seg1-channel)
|
||||
shift
|
||||
HESEG1CHINDEX="$1"
|
||||
shift
|
||||
;;
|
||||
--driver)
|
||||
shift
|
||||
DRIVER="$1"
|
||||
|
|
@ -629,15 +671,22 @@ can_be_ap() {
|
|||
}
|
||||
|
||||
can_transmit_to_channel() {
|
||||
local IFACE CHANNEL_NUM CHANNEL_INFO
|
||||
local IFACE CHANNEL_NUM CHANNEL_INFO CHANNEL_FREQ_FILTER
|
||||
IFACE=$1
|
||||
CHANNEL_NUM=$2
|
||||
if [[ $FREQ_BAND == "2.4" ]]; then
|
||||
CHANNEL_FREQ_FILTER="(24)"
|
||||
elif [[ $FREQ_BAND -eq 5 ]]; then
|
||||
CHANNEL_FREQ_FILTER="(5[1-8])"
|
||||
elif [[ $FREQ_BAND -eq 6 ]]; then
|
||||
CHANNEL_FREQ_FILTER="((59)|(6[0-9])|(7[0-1]))"
|
||||
fi
|
||||
|
||||
if [[ $USE_IWCONFIG -eq 0 ]]; then
|
||||
CHANNEL_INFO=$(get_adapter_info "${IFACE}" | grep -E " [0-9]+(\.[0-9]+){0,1} MHz \[${CHANNEL_NUM}\]")
|
||||
CHANNEL_INFO=$(get_adapter_info "${IFACE}" | grep -E " ${CHANNEL_FREQ_FILTER}[0-9]{2}(\.[0-9]+){0,1} MHz \[${CHANNEL_NUM}\]")
|
||||
[[ -z "${CHANNEL_INFO}" ]] && return 1
|
||||
[[ "${CHANNEL_INFO}" == *no\ IR* ]] && return 1
|
||||
[[ "${CHANNEL_INFO}" == *disabled* ]] && return 1
|
||||
[[ "${CHANNEL_INFO}" == *no\ IR* ]] && return 2
|
||||
[[ "${CHANNEL_INFO}" == *disabled* ]] && return 3
|
||||
return 0
|
||||
else
|
||||
CHANNEL_NUM=$(printf '%02d' ${CHANNEL_NUM})
|
||||
|
|
@ -1953,6 +2002,15 @@ write_hostapd_conf() {
|
|||
echo "require_vht=1" >> "$CONFDIR/hostapd.conf"
|
||||
fi
|
||||
|
||||
if [[ $IEEE80211AX -eq 1 ]]; then
|
||||
echo "ieee80211ax=1" >> "$CONFDIR/hostapd.conf"
|
||||
fi
|
||||
|
||||
if [[ $REQUIREHE -eq 1 ]]; then
|
||||
echo "require_he=1" >> "$CONFDIR/hostapd.conf"
|
||||
fi
|
||||
|
||||
|
||||
if [[ -n "$VHT_CAPAB" ]]; then
|
||||
echo "vht_capab=${VHT_CAPAB}" >> "$CONFDIR/hostapd.conf"
|
||||
fi
|
||||
|
|
@ -1975,7 +2033,25 @@ write_hostapd_conf() {
|
|||
EOF
|
||||
fi
|
||||
|
||||
if [[ $IEEE80211N -eq 1 ]] || [[ $IEEE80211AC -eq 1 ]]; then
|
||||
if [[ $HECHANNELWIDTH -gt 0 ]]; then
|
||||
cat <<- EOF >> "$CONFDIR/hostapd.conf"
|
||||
he_oper_chwidth=${HECHANNELWIDTH}
|
||||
EOF
|
||||
fi
|
||||
|
||||
if [[ $HESEG0CHINDEX -gt 0 ]]; then
|
||||
cat <<- EOF >> "$CONFDIR/hostapd.conf"
|
||||
he_oper_centr_freq_seg0_idx=${HESEG0CHINDEX}
|
||||
EOF
|
||||
fi
|
||||
|
||||
if [[ $HESEG1CHINDEX -gt 0 ]]; then
|
||||
cat <<- EOF >> "$CONFDIR/hostapd.conf"
|
||||
he_oper_centr_freq_seg1_idx=${HESEG1CHINDEX}
|
||||
EOF
|
||||
fi
|
||||
|
||||
if [[ $IEEE80211N -eq 1 ]] || [[ $IEEE80211AC -eq 1 ]] || [[ $IEEE80211AX -eq 1 ]]; then
|
||||
echo "wmm_enabled=1" >> "$CONFDIR/hostapd.conf"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue