From a18d4e75a4323948ced7fdaf9e16fddb70f04e5a Mon Sep 17 00:00:00 2001
From: Phani Pavan K <kphanipavan+goose@gmail.com>
Date: Mon, 28 Jul 2025 12:34:55 +0530
Subject: [PATCH 01/11] add he beamform(er/ee) options

---
 lnxrouter | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lnxrouter b/lnxrouter
index b9ae55f..0fc13ea 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -137,6 +137,9 @@ Options:
                             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'
+    --he-su-bfe             Enable HE Single User Beamformee support
+    --he-su-bfr             Enable HE Single User Beamformer support
+    --he-mu-bfr             Enable HE Multi User Beamformer support
 
   Instance managing:
     --daemon                Run in background
@@ -223,6 +226,9 @@ define_global_variables(){
     HECHANNELWIDTH=0
     HESEG0CHINDEX=0
     HESEG1CHINDEX=0
+    HESUBFE=0
+    HESUBFR=0
+    HEMUBFR=0
     DRIVER=nl80211
     NO_VIRT=0 # not use virtual interface
     COUNTRY=
@@ -489,6 +495,21 @@ parse_user_options(){
                 HESEG1CHINDEX="$1"
                 shift
                 ;;
+            --he-su-bfe)
+                shift
+                HESUBFE=1
+                shift
+                ;;
+            --he-su-bfr)
+                shift
+                HESUBFR=1
+                shift
+                ;;
+            --he-mu-bfr)
+                shift
+                HEMUBFR=1
+                shift
+                ;;
             --driver)
                 shift
                 DRIVER="$1"
@@ -2014,7 +2035,17 @@ write_hostapd_conf() {
         echo "require_he=1" >> "$CONFDIR/hostapd.conf"
     fi
 
+    if [[ $HESUBFE -eq 1 ]]; then
+        echo "he_su_beamformee=1" >> "$CONFDIR/hostapd.conf"
+    fi
 
+    if [[ $HESUBFR -eq 1 ]]; then
+        echo "he_su_beamformer=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
+    if [[ $HEMUBFR -eq 1 ]]; then
+        echo "he_mu_beamformer=1" >> "$CONFDIR/hostapd.conf"
+    fi
 
     if [[ -n "$VHT_CAPAB" ]]; then
         echo "vht_capab=${VHT_CAPAB}" >> "$CONFDIR/hostapd.conf"

From 13a1654b911c98b8c44eb27f619ce178ec32b1a7 Mon Sep 17 00:00:00 2001
From: Phani Pavan K <kphanipavan+goose@gmail.com>
Date: Mon, 28 Jul 2025 15:52:30 +0530
Subject: [PATCH 02/11] added p2p twt and idle timeout, remove random spaces

---
 lnxrouter | 55 ++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index 0fc13ea..8716617 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -101,15 +101,16 @@ Options:
                             (defaults to /etc/hostapd/hostapd.accept)
     --hostapd-debug <level> 1 or 2. Passes -d or -dd to hostapd
     --isolate-clients       Disable wifi communication between clients
+    --idle-timeout <time>   Idle timeout (in seconds) to disconnect a client device
     --no-haveged            Do not run haveged automatically when needed
-    --hs20                  Enable Hotspot 2.0
+    --hs20                  (ß) Enable Hotspot 2.0
 
-    WiFi 4 (802.11n) configs:
+  WiFi 4 (802.11n) configs:
     --wifi4                 Enable IEEE 802.11n (HT)
     --req-ht                Require station HT (High Throughput) mode
     --ht-capab <HT caps>    HT capabilities (default: [HT40+])
 
-    WiFi 5 (802.11ac) configs:
+  WiFi 5 (802.11ac) configs:
     --wifi5                 Enable IEEE 802.11ac (VHT)
     --req-vht               Require station VHT (Very High Thoughtput) mode
     --vht-capab <VHT caps>  VHT capabilities
@@ -124,8 +125,8 @@ Options:
     --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)
+  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:
@@ -137,9 +138,13 @@ Options:
                             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'
-    --he-su-bfe             Enable HE Single User Beamformee support
-    --he-su-bfr             Enable HE Single User Beamformer support
-    --he-mu-bfr             Enable HE Multi User Beamformer support
+    --he-su-bfe             (beta) Enable HE Single User Beamformee support
+    --he-su-bfr             (beta) Enable HE Single User Beamformer support
+    --he-mu-bfr             (beta) Enable HE Multi User Beamformer support
+    --enable-twt            (beta) (ß) Enable Peer to Peer Target Wake Time support
+
+  (ß): Requires hostapd built with specific build flags enabled
+
 
   Instance managing:
     --daemon                Run in background
@@ -212,6 +217,7 @@ define_global_variables(){
     WPA_VERSION=2
     MAC_FILTER=0
     MAC_FILTER_ACCEPT=/etc/hostapd/hostapd.accept
+    IDLETIMEOUT=300
     IEEE80211N=0
     REQUIREHT=0
     IEEE80211AC=0
@@ -229,6 +235,7 @@ define_global_variables(){
     HESUBFE=0
     HESUBFR=0
     HEMUBFR=0
+    HEP2PTWT=0
     DRIVER=nl80211
     NO_VIRT=0 # not use virtual interface
     COUNTRY=
@@ -297,8 +304,6 @@ parse_user_options(){
                 SHARE_METHOD=redsocks
                 shift
                 ;;
-
-
             -g)
                 shift
                 GATEWAY4="$1"
@@ -327,7 +332,6 @@ parse_user_options(){
                 shift
                 MAC_USE_RANDOM=1
                 ;;
-
             --dns)
                 shift
                 DNS="$1"
@@ -377,12 +381,10 @@ parse_user_options(){
                 shift
                 DNS_NOCACHE=1
                 ;;
-
             --isolate-clients)
                 shift
                 ISOLATE_CLIENTS=1
                 ;;
-
             --ap)
                 shift
                 WIFI_IFACE="$1"
@@ -399,8 +401,6 @@ parse_user_options(){
                 shift
                 QR=1
                 ;;
-
-
             --hidden)
                 shift
                 HIDDEN=1
@@ -414,7 +414,6 @@ parse_user_options(){
                 MAC_FILTER_ACCEPT="$1"
                 shift
                 ;;
-
             -c)
                 shift
                 CHANNEL="$1"
@@ -430,7 +429,11 @@ parse_user_options(){
                 [[ "$WPA_VERSION" == "2+1" ]] && WPA_VERSION=1+2
                 shift
                 ;;
-
+            --idle-timeout)
+                shift
+                IDLETIMEOUT="$1"
+                shift
+                ;;
             --wifi4|--ieee80211n)
                 shift
                 IEEE80211N=1
@@ -498,17 +501,18 @@ parse_user_options(){
             --he-su-bfe)
                 shift
                 HESUBFE=1
-                shift
                 ;;
             --he-su-bfr)
                 shift
                 HESUBFR=1
-                shift
                 ;;
             --he-mu-bfr)
                 shift
                 HEMUBFR=1
+                ;;
+            --enable-twt)
                 shift
+                HEP2PTWT=1
                 ;;
             --driver)
                 shift
@@ -524,7 +528,6 @@ parse_user_options(){
                 VIRT_NAME="$1"
                 shift
                 ;;
-
             --country)
                 shift
                 COUNTRY="$1"
@@ -555,7 +558,6 @@ parse_user_options(){
                 shift
                 USE_PSK=1
                 ;;
-
             --daemon)
                 shift
                 DAEMONIZE=1
@@ -578,7 +580,6 @@ parse_user_options(){
                 shift
                 KEEP_CONFDIR=1
                 ;;
-
             *)
                 echo  "Invalid parameter: $1" 1>&2
                 exit 1
@@ -799,7 +800,7 @@ show_interface_pci_info() {  # pci id / model / virtual
     [[ -n "$driver" ]] && echo "System-already-loaded driver: $driver"
     [[ -n "$device_fullname" ]] && echo "$device_fullname"
     echo ""
-    # TODO usb
+    # TODO Fix pci and usb devices
 }
 
 alloc_new_vface_name() { # only for wifi
@@ -2023,6 +2024,10 @@ write_hostapd_conf() {
         echo "ieee80211ac=1" >> "$CONFDIR/hostapd.conf"
     fi
 
+    if [[ $IDLETIMEOUT -ne 300 ]]; then
+        echo "ap_max_inactivity=${IDLETIMEOUT}" >> "$CONFDIR/hostapd.conf"
+    fi
+
     if [[ $REQUIREVHT -eq 1 ]]; then
         echo "require_vht=1" >> "$CONFDIR/hostapd.conf"
     fi
@@ -2047,6 +2052,10 @@ write_hostapd_conf() {
         echo "he_mu_beamformer=1" >> "$CONFDIR/hostapd.conf"
     fi
 
+    if [[ $HEP2PTWT -eq 1 ]]; then
+        echo "peer_to_peer_twt=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
     if [[ -n "$VHT_CAPAB" ]]; then
         echo "vht_capab=${VHT_CAPAB}" >> "$CONFDIR/hostapd.conf"
     fi

From d288b8f0eddbb0247a9333452e00f9db103ce648 Mon Sep 17 00:00:00 2001
From: Phani Pavan K <kphanipavan+goose@gmail.com>
Date: Mon, 28 Jul 2025 16:00:26 +0530
Subject: [PATCH 03/11] bump unstable version

---
 lnxrouter | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnxrouter b/lnxrouter
index 8716617..17a8756 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.8.0-unstable2
+VERSION=0.8.0-unstable3
 PROGNAME="$(basename "$0")"
 
 export LC_ALL=C

From bc8bfb5cab02d0a93030ad70be5a720e38b075f3 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 04/11] wifi 4~6 options sequence

---
 lnxrouter | 108 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 47 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index 17a8756..e6ccea5 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -218,17 +218,21 @@ define_global_variables(){
     MAC_FILTER=0
     MAC_FILTER_ACCEPT=/etc/hostapd/hostapd.accept
     IDLETIMEOUT=300
+
+    #wifi4
     IEEE80211N=0
     REQUIREHT=0
+    HT_CAPAB='[HT40+]'
+    #wifi5
     IEEE80211AC=0
     REQUIREVHT=0
-    IEEE80211AX=0
-    REQUIREHE=0
-    HT_CAPAB='[HT40+]'
     VHT_CAPAB=
     VHTCHANNELWIDTH=0
     VHTSEG0CHINDEX=0
     VHTSEG1CHINDEX=0
+    #wifi6
+    IEEE80211AX=0
+    REQUIREHE=0
     HECHANNELWIDTH=0
     HESEG0CHINDEX=0
     HESEG1CHINDEX=0
@@ -236,6 +240,7 @@ define_global_variables(){
     HESUBFR=0
     HEMUBFR=0
     HEP2PTWT=0
+
     DRIVER=nl80211
     NO_VIRT=0 # not use virtual interface
     COUNTRY=
@@ -385,6 +390,7 @@ parse_user_options(){
                 shift
                 ISOLATE_CLIENTS=1
                 ;;
+            # wifi ap
             --ap)
                 shift
                 WIFI_IFACE="$1"
@@ -434,6 +440,7 @@ parse_user_options(){
                 IDLETIMEOUT="$1"
                 shift
                 ;;
+            # wifi 4
             --wifi4|--ieee80211n)
                 shift
                 IEEE80211N=1
@@ -442,27 +449,20 @@ parse_user_options(){
                 shift
                 REQUIREHT=1
                 ;;
-            --wifi5|--ieee80211ac)
-                shift
-                IEEE80211AC=1
-                ;;
-            --wifi6|--ieee80211ax)
-                shift
-                IEEE80211AX=1
-                ;;
-            --req-he|--require-he)
-                shift
-                REQUIREHE=1
-                ;;
-            --req-vht|--require-vht)
-                shift
-                REQUIREVHT=1
-                ;;
             --ht-capab)
                 shift
                 HT_CAPAB="$1"
                 shift
                 ;;
+            # wifi 5
+            --wifi5|--ieee80211ac)
+                shift
+                IEEE80211AC=1
+                ;;
+            --req-vht|--require-vht)
+                shift
+                REQUIREVHT=1
+                ;;
             --vht-capab)
                 shift
                 VHT_CAPAB="$1"
@@ -483,6 +483,15 @@ parse_user_options(){
                 VHTSEG1CHINDEX="$1"
                 shift
                 ;;
+            # wifi 6
+            --wifi6|--ieee80211ax)
+                shift
+                IEEE80211AX=1
+                ;;
+            --req-he|--require-he)
+                shift
+                REQUIREHE=1
+                ;;
             --he-ch-width|--he-channel-width)
                 shift
                 HECHANNELWIDTH="$1"
@@ -2009,6 +2018,11 @@ write_hostapd_conf() {
         echo "hs20=1" >> "$CONFDIR/hostapd.conf"
     fi
 
+    if [[ $IDLETIMEOUT -ne 300 ]]; then
+        echo "ap_max_inactivity=${IDLETIMEOUT}" >> "$CONFDIR/hostapd.conf"
+    fi
+
+    # wifi4 -----------------
     if [[ $IEEE80211N -eq 1 ]]; then
         cat <<- EOF >> "$CONFDIR/hostapd.conf"
 			ieee80211n=1
@@ -2020,42 +2034,15 @@ write_hostapd_conf() {
         echo "require_ht=1" >> "$CONFDIR/hostapd.conf"
     fi
 
+    # wifi5 -----------------
     if [[ $IEEE80211AC -eq 1 ]]; then
         echo "ieee80211ac=1" >> "$CONFDIR/hostapd.conf"
     fi
 
-    if [[ $IDLETIMEOUT -ne 300 ]]; then
-        echo "ap_max_inactivity=${IDLETIMEOUT}" >> "$CONFDIR/hostapd.conf"
-    fi
-
     if [[ $REQUIREVHT -eq 1 ]]; then
         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 [[ $HESUBFE -eq 1 ]]; then
-        echo "he_su_beamformee=1" >> "$CONFDIR/hostapd.conf"
-    fi
-
-    if [[ $HESUBFR -eq 1 ]]; then
-        echo "he_su_beamformer=1" >> "$CONFDIR/hostapd.conf"
-    fi
-
-    if [[ $HEMUBFR -eq 1 ]]; then
-        echo "he_mu_beamformer=1" >> "$CONFDIR/hostapd.conf"
-    fi
-
-    if [[ $HEP2PTWT -eq 1 ]]; then
-        echo "peer_to_peer_twt=1" >> "$CONFDIR/hostapd.conf"
-    fi
-
     if [[ -n "$VHT_CAPAB" ]]; then
         echo "vht_capab=${VHT_CAPAB}" >> "$CONFDIR/hostapd.conf"
     fi
@@ -2078,6 +2065,31 @@ write_hostapd_conf() {
 		EOF
 	fi
 
+	# wifi6 -----------------
+    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 [[ $HESUBFE -eq 1 ]]; then
+        echo "he_su_beamformee=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
+    if [[ $HESUBFR -eq 1 ]]; then
+        echo "he_su_beamformer=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
+    if [[ $HEMUBFR -eq 1 ]]; then
+        echo "he_mu_beamformer=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
+    if [[ $HEP2PTWT -eq 1 ]]; then
+        echo "peer_to_peer_twt=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
     if [[ $HECHANNELWIDTH -gt 0 ]]; then
 		cat <<- EOF >> "$CONFDIR/hostapd.conf"
 			he_oper_chwidth=${HECHANNELWIDTH}
@@ -2096,10 +2108,12 @@ write_hostapd_conf() {
 		EOF
 	fi
 
+	# -----------------
     if [[ $IEEE80211N -eq 1 ]] || [[ $IEEE80211AC -eq 1 ]] || [[ $IEEE80211AX -eq 1 ]]; then
         echo "wmm_enabled=1" >> "$CONFDIR/hostapd.conf"
     fi
 
+    # -----------------
     if [[ -n "$PASSPHRASE" ]]; then
         [[ "$WPA_VERSION" == "1+2" ]] && WPA_VERSION=3
         if [[ $USE_PSK -eq 0 ]]; then

From ff15c193838960eb884a8f881021830e2a1f7596 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 05/11] wifi options sequence

---
 lnxrouter | 144 +++++++++++++++++++++++++++---------------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index e6ccea5..cdb3b56 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -217,6 +217,15 @@ define_global_variables(){
     WPA_VERSION=2
     MAC_FILTER=0
     MAC_FILTER_ACCEPT=/etc/hostapd/hostapd.accept
+    DRIVER=nl80211
+    NO_VIRT=0 # not use virtual interface
+    COUNTRY=
+    FREQ_BAND=2.4
+    NO_HAVEGED=0
+    HOSTAPD_DEBUG_ARGS=
+    USE_PSK=0
+    ISOLATE_CLIENTS=0
+    QR=0 # show wifi qr
     IDLETIMEOUT=300
 
     #wifi4
@@ -241,16 +250,6 @@ define_global_variables(){
     HEMUBFR=0
     HEP2PTWT=0
 
-    DRIVER=nl80211
-    NO_VIRT=0 # not use virtual interface
-    COUNTRY=
-    FREQ_BAND=2.4
-    NO_HAVEGED=0
-    HOSTAPD_DEBUG_ARGS=
-    USE_PSK=0
-    ISOLATE_CLIENTS=0
-    QR=0 # show wifi qr
-
     # script variables
     PHY=
     VWIFI_IFACE=  # virtual wifi interface name, if created
@@ -440,6 +439,50 @@ parse_user_options(){
                 IDLETIMEOUT="$1"
                 shift
                 ;;
+            --driver)
+                shift
+                DRIVER="$1"
+                shift
+                ;;
+            --no-virt)
+                shift
+                NO_VIRT=1
+                ;;
+            --virt-name)
+                shift
+                VIRT_NAME="$1"
+                shift
+                ;;
+            --country)
+                shift
+                COUNTRY="$1"
+                shift
+                ;;
+            --freq-band)
+                shift
+                FREQ_BAND="$1"
+                shift
+                ;;
+            --no-haveged)
+                shift
+                NO_HAVEGED=1
+                ;;
+            --hostapd-debug)
+                shift
+                if [ "$1" = "1" ]; then
+                    HOSTAPD_DEBUG_ARGS="-d"
+                elif [ "$1" = "2" ]; then
+                    HOSTAPD_DEBUG_ARGS="-dd"
+                else
+                    printf "Error: argument for --hostapd-debug expected 1 or 2, got %s\n" "$1"
+                    exit 1
+                fi
+                shift
+                ;;
+            --psk)
+                shift
+                USE_PSK=1
+                ;;
             # wifi 4
             --wifi4|--ieee80211n)
                 shift
@@ -523,50 +566,7 @@ parse_user_options(){
                 shift
                 HEP2PTWT=1
                 ;;
-            --driver)
-                shift
-                DRIVER="$1"
-                shift
-                ;;
-            --no-virt)
-                shift
-                NO_VIRT=1
-                ;;
-            --virt-name)
-                shift
-                VIRT_NAME="$1"
-                shift
-                ;;
-            --country)
-                shift
-                COUNTRY="$1"
-                shift
-                ;;
-            --freq-band)
-                shift
-                FREQ_BAND="$1"
-                shift
-                ;;
-            --no-haveged)
-                shift
-                NO_HAVEGED=1
-                ;;
-            --hostapd-debug)
-                shift
-                if [ "$1" = "1" ]; then
-                    HOSTAPD_DEBUG_ARGS="-d"
-                elif [ "$1" = "2" ]; then
-                    HOSTAPD_DEBUG_ARGS="-dd"
-                else
-                    printf "Error: argument for --hostapd-debug expected 1 or 2, got %s\n" "$1"
-                    exit 1
-                fi
-                shift
-                ;;
-            --psk)
-                shift
-                USE_PSK=1
-                ;;
+            # instance managing
             --daemon)
                 shift
                 DAEMONIZE=1
@@ -2014,6 +2014,24 @@ write_hostapd_conf() {
 		EOF
     fi
 
+    if [[ -n "$PASSPHRASE" ]]; then
+        [[ "$WPA_VERSION" == "1+2" ]] && WPA_VERSION=3
+        if [[ $USE_PSK -eq 0 ]]; then
+            WPA_KEY_TYPE=passphrase
+        else
+            WPA_KEY_TYPE=psk
+        fi
+        cat <<- EOF >> "$CONFDIR/hostapd.conf"
+			wpa=${WPA_VERSION}
+			wpa_${WPA_KEY_TYPE}=${PASSPHRASE}
+			wpa_key_mgmt=WPA-PSK
+			wpa_pairwise=CCMP
+			rsn_pairwise=CCMP
+		EOF
+    else
+        echo "WARN: WiFi is not protected by password" >&2
+    fi
+
     if [[ $HOTSPOT20 -eq 1 ]]; then
         echo "hs20=1" >> "$CONFDIR/hostapd.conf"
     fi
@@ -2113,24 +2131,6 @@ write_hostapd_conf() {
         echo "wmm_enabled=1" >> "$CONFDIR/hostapd.conf"
     fi
 
-    # -----------------
-    if [[ -n "$PASSPHRASE" ]]; then
-        [[ "$WPA_VERSION" == "1+2" ]] && WPA_VERSION=3
-        if [[ $USE_PSK -eq 0 ]]; then
-            WPA_KEY_TYPE=passphrase
-        else
-            WPA_KEY_TYPE=psk
-        fi
-        cat <<- EOF >> "$CONFDIR/hostapd.conf"
-			wpa=${WPA_VERSION}
-			wpa_${WPA_KEY_TYPE}=${PASSPHRASE}
-			wpa_key_mgmt=WPA-PSK
-			wpa_pairwise=CCMP
-			rsn_pairwise=CCMP
-		EOF
-    else
-        echo "WARN: WiFi is not protected by password" >&2
-    fi
     chmod 600 "$CONFDIR/hostapd.conf"
 }
 

From 958ebffd7f06f503d6189cd048c6a8ec3011f7c4 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 06/11] rename --enable-twt to --p2ptwt

---
 lnxrouter | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index cdb3b56..5449174 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -141,7 +141,7 @@ Options:
     --he-su-bfe             (beta) Enable HE Single User Beamformee support
     --he-su-bfr             (beta) Enable HE Single User Beamformer support
     --he-mu-bfr             (beta) Enable HE Multi User Beamformer support
-    --enable-twt            (beta) (ß) Enable Peer to Peer Target Wake Time support
+    --p2ptwt                (beta) (ß) Enable Peer to Peer Target Wake Time
 
   (ß): Requires hostapd built with specific build flags enabled
 
@@ -248,7 +248,7 @@ define_global_variables(){
     HESUBFE=0
     HESUBFR=0
     HEMUBFR=0
-    HEP2PTWT=0
+    P2PTWT=0
 
     # script variables
     PHY=
@@ -562,9 +562,9 @@ parse_user_options(){
                 shift
                 HEMUBFR=1
                 ;;
-            --enable-twt)
+            --p2ptwt)
                 shift
-                HEP2PTWT=1
+                P2PTWT=1
                 ;;
             # instance managing
             --daemon)
@@ -2104,10 +2104,6 @@ write_hostapd_conf() {
         echo "he_mu_beamformer=1" >> "$CONFDIR/hostapd.conf"
     fi
 
-    if [[ $HEP2PTWT -eq 1 ]]; then
-        echo "peer_to_peer_twt=1" >> "$CONFDIR/hostapd.conf"
-    fi
-
     if [[ $HECHANNELWIDTH -gt 0 ]]; then
 		cat <<- EOF >> "$CONFDIR/hostapd.conf"
 			he_oper_chwidth=${HECHANNELWIDTH}
@@ -2126,6 +2122,10 @@ write_hostapd_conf() {
 		EOF
 	fi
 
+    if [[ $P2PTWT -eq 1 ]]; then
+        echo "peer_to_peer_twt=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
 	# -----------------
     if [[ $IEEE80211N -eq 1 ]] || [[ $IEEE80211AC -eq 1 ]] || [[ $IEEE80211AX -eq 1 ]]; then
         echo "wmm_enabled=1" >> "$CONFDIR/hostapd.conf"

From 3ebbf374285fbce0867295a18bb8a15c9c986442 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 07/11] Rename --idle-timeout to --sta-timeout. No default
 value

---
 lnxrouter | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index 5449174..5cbcbb7 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -101,7 +101,7 @@ Options:
                             (defaults to /etc/hostapd/hostapd.accept)
     --hostapd-debug <level> 1 or 2. Passes -d or -dd to hostapd
     --isolate-clients       Disable wifi communication between clients
-    --idle-timeout <time>   Idle timeout (in seconds) to disconnect a client device
+    --sta-timeout <seconds> Timeout to disconnect a no-signal client
     --no-haveged            Do not run haveged automatically when needed
     --hs20                  (ß) Enable Hotspot 2.0
 
@@ -226,7 +226,7 @@ define_global_variables(){
     USE_PSK=0
     ISOLATE_CLIENTS=0
     QR=0 # show wifi qr
-    IDLETIMEOUT=300
+    STATIMEOUT=
 
     #wifi4
     IEEE80211N=0
@@ -434,9 +434,9 @@ parse_user_options(){
                 [[ "$WPA_VERSION" == "2+1" ]] && WPA_VERSION=1+2
                 shift
                 ;;
-            --idle-timeout)
+            --sta-timeout)
                 shift
-                IDLETIMEOUT="$1"
+                STATIMEOUT="$1"
                 shift
                 ;;
             --driver)
@@ -2036,8 +2036,8 @@ write_hostapd_conf() {
         echo "hs20=1" >> "$CONFDIR/hostapd.conf"
     fi
 
-    if [[ $IDLETIMEOUT -ne 300 ]]; then
-        echo "ap_max_inactivity=${IDLETIMEOUT}" >> "$CONFDIR/hostapd.conf"
+    if [[ -n "$STATIMEOUT" ]]; then
+        echo "ap_max_inactivity=${STATIMEOUT}" >> "$CONFDIR/hostapd.conf"
     fi
 
     # wifi4 -----------------

From bbb70b99ba119d3b436f24a8b9b10925d11b8dbe Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 08/11] update wifi options description

---
 lnxrouter | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index 5cbcbb7..e1340ff 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -103,18 +103,18 @@ Options:
     --isolate-clients       Disable wifi communication between clients
     --sta-timeout <seconds> Timeout to disconnect a no-signal client
     --no-haveged            Do not run haveged automatically when needed
-    --hs20                  (ß) Enable Hotspot 2.0
+    --hs20                  Enable Hotspot 2.0
 
   WiFi 4 (802.11n) configs:
     --wifi4                 Enable IEEE 802.11n (HT)
     --req-ht                Require station HT (High Throughput) mode
-    --ht-capab <HT caps>    HT capabilities (default: [HT40+])
+    --ht-capab <HT caps>    HT capabilities (example: '[HT40+][HT40-]')
+                            (default: '[HT40+]')
 
   WiFi 5 (802.11ac) configs:
     --wifi5                 Enable IEEE 802.11ac (VHT)
     --req-vht               Require station VHT (Very High Thoughtput) mode
-    --vht-capab <VHT caps>  VHT capabilities
-
+    --vht-capab <VHT caps>  VHT capabilities (example: '[VHT160][RXLDPC]')
     --vht-ch-width <index>  Index of VHT channel width:
                                 0 for 20MHz or 40MHz (default)
                                 1 for 80MHz
@@ -126,7 +126,7 @@ Options:
                             (second 80MHz) segment. Use with '--vht-ch-width 3'
 
   WiFi 6 (802.11ax) configs:
-    --wifi6                 (ß) Enable IEEE 802.11ax (HE)
+    --wifi6                 Enable IEEE 802.11ax (HE)
     --req-he                Require station HE (High Efficiency) mode
 
     --he-ch-width <index>   Index of HE channel width:
@@ -138,13 +138,13 @@ Options:
                             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'
-    --he-su-bfe             (beta) Enable HE Single User Beamformee support
-    --he-su-bfr             (beta) Enable HE Single User Beamformer support
-    --he-mu-bfr             (beta) Enable HE Multi User Beamformer support
-    --p2ptwt                (beta) (ß) Enable Peer to Peer Target Wake Time
-
-  (ß): Requires hostapd built with specific build flags enabled
+    --he-su-bfe             HE Single User Beamformee support
+    --he-su-bfr             HE Single User Beamformer support
+    --he-mu-bfr             HE Multi User Beamformer support
+    --p2ptwt                Peer-to-Peer Target Wake Time support
 
+    Note: Some cutting-edge Wifi features strongly depends on hostapd built
+          with specific flags enabled and compatible hardware
 
   Instance managing:
     --daemon                Run in background

From 7ecc8464590daf70f0805007df52eada94a0670d Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 09/11] alias: --req-wifi4 = --req-ht . Same for wifi5/6

---
 lnxrouter | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index e1340ff..90b35a4 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -106,14 +106,13 @@ Options:
     --hs20                  Enable Hotspot 2.0
 
   WiFi 4 (802.11n) configs:
-    --wifi4                 Enable IEEE 802.11n (HT)
-    --req-ht                Require station HT (High Throughput) mode
+    --wifi4                 Enable IEEE 802.11n (HT, High Throughput)
     --ht-capab <HT caps>    HT capabilities (example: '[HT40+][HT40-]')
                             (default: '[HT40+]')
+    --req-wifi4             Only support Wifi>=4 clients
 
   WiFi 5 (802.11ac) configs:
-    --wifi5                 Enable IEEE 802.11ac (VHT)
-    --req-vht               Require station VHT (Very High Thoughtput) mode
+    --wifi5                 Enable IEEE 802.11ac (VHT, Very High Thoughtput)
     --vht-capab <VHT caps>  VHT capabilities (example: '[VHT160][RXLDPC]')
     --vht-ch-width <index>  Index of VHT channel width:
                                 0 for 20MHz or 40MHz (default)
@@ -124,11 +123,10 @@ 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'
+    --req-wifi5             Only support Wifi>=5 clients
 
   WiFi 6 (802.11ax) configs:
-    --wifi6                 Enable IEEE 802.11ax (HE)
-    --req-he                Require station HE (High Efficiency) mode
-
+    --wifi6                 Enable IEEE 802.11ax (HE, High Efficiency)
     --he-ch-width <index>   Index of HE channel width:
                                 0 for 20MHz or 40MHz (default)
                                 1 for 80MHz
@@ -141,6 +139,7 @@ Options:
     --he-su-bfe             HE Single User Beamformee support
     --he-su-bfr             HE Single User Beamformer support
     --he-mu-bfr             HE Multi User Beamformer support
+    --req-wifi6             Only support Wifi>=6 clients
     --p2ptwt                Peer-to-Peer Target Wake Time support
 
     Note: Some cutting-edge Wifi features strongly depends on hostapd built
@@ -488,7 +487,7 @@ parse_user_options(){
                 shift
                 IEEE80211N=1
                 ;;
-            --req-ht|--require-ht)
+            --req-wifi4|--req-ht|--require-ht)
                 shift
                 REQUIREHT=1
                 ;;
@@ -502,7 +501,7 @@ parse_user_options(){
                 shift
                 IEEE80211AC=1
                 ;;
-            --req-vht|--require-vht)
+            --req-wifi5|--req-vht|--require-vht)
                 shift
                 REQUIREVHT=1
                 ;;
@@ -531,7 +530,7 @@ parse_user_options(){
                 shift
                 IEEE80211AX=1
                 ;;
-            --req-he|--require-he)
+            --req-wifi6|--req-he|--require-he)
                 shift
                 REQUIREHE=1
                 ;;

From a511219b50ff3160f160f49f17ffb267142daa4c Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 10/11] hostapd.conf: separate ieee80211n=1 and ht_capab=

---
 lnxrouter | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lnxrouter b/lnxrouter
index 90b35a4..8197c25 100755
--- a/lnxrouter
+++ b/lnxrouter
@@ -2041,10 +2041,11 @@ write_hostapd_conf() {
 
     # wifi4 -----------------
     if [[ $IEEE80211N -eq 1 ]]; then
-        cat <<- EOF >> "$CONFDIR/hostapd.conf"
-			ieee80211n=1
-			ht_capab=${HT_CAPAB}
-		EOF
+        echo "ieee80211n=1" >> "$CONFDIR/hostapd.conf"
+    fi
+
+    if [[ -n "$HT_CAPAB" ]]; then
+        echo "ht_capab=${HT_CAPAB}" >> "$CONFDIR/hostapd.conf"
     fi
 
     if [[ $REQUIREHT -eq 1 ]]; then

From c6d704e3aad0827af218487505a73b4afecc0ba8 Mon Sep 17 00:00:00 2001
From: garywill <garywill@disroot.org>
Date: Sun, 17 Aug 2025 10:32:48 +0800
Subject: [PATCH 11/11] readme

---
 README.md | 82 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 1b2135b..7d2243b 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@ Basic features:
   - Specify upstream DNS (kind of a plain DNS proxy)
 - IPv6 (behind NATed LAN, like IPv4)
 - Creating WiFi hotspot:
+  - Wifi 4/5/6
+  - 2.4GHz, 5GHz
   - Channel selecting
   - Choose encryptions: WPA2/WPA, WPA2, WPA, No encryption
   - Create AP on the same interface you are getting Internet (usually require same channel)
@@ -313,17 +315,17 @@ Options:
                             queries to other interfaces)
     -n                      Do not provide Internet
     --ban-priv              Disallow clients to access my private network
-    
+
     -g <ip>                 This host's IPv4 address in subnet (mask is /24)
                             (example: '192.168.5.1' or '5' shortly)
     -6                      Enable IPv6 (NAT)
     --no4                   Disable IPv4 Internet (not forwarding IPv4).
                             Usually used with '-6'
-                            
-    --p6 <prefix>           Set IPv6 LAN address prefix (length 64) 
-                            (example: 'fd00:0:0:5::' or '5' shortly) 
+
+    --p6 <prefix>           Set IPv6 LAN address prefix (length 64)
+                            (example: 'fd00:0:0:5::' or '5' shortly)
                             Using this enables '-6'
-                            
+
     --dns <ip>|<port>|<ip:port>
                             DNS server's upstream DNS.
                             Use ',' to seperate multiple servers
@@ -331,37 +333,37 @@ Options:
                             (Note IPv6 addresses need '[]' around)
     --no-dns                Do not serve DNS
     --no-dnsmasq            Disable dnsmasq server (DHCP, DNS, RA)
-    --catch-dns             Transparent DNS proxy, redirect packets(TCP/UDP) 
+    --catch-dns             Transparent DNS proxy, redirect packets(TCP/UDP)
                             whose destination port is 53 to this host
     --log-dns               Show DNS query log (dnsmasq)
     --dhcp-dns <IP1[,IP2]>|no
                             Set IPv4 DNS offered by DHCP (default: this host).
     --dhcp-dns6 <IP1[,IP2]>|no
-                            Set IPv6 DNS offered by DHCP (RA) 
+                            Set IPv6 DNS offered by DHCP (RA)
                             (default: this host)
                             (Note IPv6 addresses need '[]' around)
-                            Using both above two will enable '--no-dns' 
+                            Using both above two will enable '--no-dns'
     --hostname <name>       DNS server associate this name with this host.
                             Use '-' to read name from /etc/hostname
     -d                      DNS server will take into account /etc/hosts
-    -e <hosts_file>         DNS server will take into account additional 
+    -e <hosts_file>         DNS server will take into account additional
                             hosts file
     --dns-nocache           DNS server no cache
-    
+
     --mac <MAC>             Set MAC address
     --random-mac            Use random MAC address
- 
+
     --tp <port>             Transparent proxy,
                             redirect non-LAN TCP and UDP(not tested) traffic to
                             port. (usually used with '--dns')
-    
+
   WiFi hotspot options:
     --ap <wifi interface> <SSID>
                             Create WiFi access point
-    -p, --password <password>   
+    -p, --password <password>
                             WiFi password
     --qr                    Show WiFi QR code in terminal (need qrencode)
-    
+
     --hidden                Hide access point (not broadcast SSID)
     --no-virt               Do not create virtual interface
                             Using this you can't use same wlan interface
@@ -381,44 +383,62 @@ Options:
                             (defaults to /etc/hostapd/hostapd.accept)
     --hostapd-debug <level> 1 or 2. Passes -d or -dd to hostapd
     --isolate-clients       Disable wifi communication between clients
+    --sta-timeout <seconds> Timeout to disconnect a no-signal client
     --no-haveged            Do not run haveged automatically when needed
     --hs20                  Enable Hotspot 2.0
 
-    WiFi 4 (802.11n) configs:
-    --wifi4                 Enable IEEE 802.11n (HT)
-    --req-ht                Require station HT (High Throughput) mode
-    --ht-capab <HT caps>    HT capabilities (default: [HT40+])
+  WiFi 4 (802.11n) configs:
+    --wifi4                 Enable IEEE 802.11n (HT, High Throughput)
+    --ht-capab <HT caps>    HT capabilities (example: '[HT40+][HT40-]')
+                            (default: '[HT40+]')
+    --req-wifi4             Only support Wifi>=4 clients
 
-    WiFi 5 (802.11ac) configs:
-    --wifi5                 Enable IEEE 802.11ac (VHT)
-    --req-vht               Require station VHT (Very High Thoughtput) mode
-    --vht-capab <VHT caps>  VHT capabilities
-    
+  WiFi 5 (802.11ac) configs:
+    --wifi5                 Enable IEEE 802.11ac (VHT, Very High Thoughtput)
+    --vht-capab <VHT caps>  VHT capabilities (example: '[VHT160][RXLDPC]')
     --vht-ch-width <index>  Index of VHT channel width:
                                 0 for 20MHz or 40MHz (default)
                                 1 for 80MHz
                                 2 for 160MHz
-                                3 for 80+80MHz (Non-contigous 160MHz)    
-    --vht-seg0-ch <channel> Channel index of VHT center frequency for primary 
+                                3 for 80+80MHz (Non-contigous 160MHz)
+    --vht-seg0-ch <channel> Channel index of VHT center frequency for primary
                             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'
+    --req-wifi5             Only support Wifi>=5 clients
+
+  WiFi 6 (802.11ax) configs:
+    --wifi6                 Enable IEEE 802.11ax (HE, High Efficiency)
+    --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'
+    --he-su-bfe             HE Single User Beamformee support
+    --he-su-bfr             HE Single User Beamformer support
+    --he-mu-bfr             HE Multi User Beamformer support
+    --req-wifi6             Only support Wifi>=6 clients
+    --p2ptwt                Peer-to-Peer Target Wake Time support
+
+    Note: Some cutting-edge Wifi features strongly depends on hostapd built
+          with specific flags enabled and compatible hardware
 
   Instance managing:
     --daemon                Run in background
+    --keep-confdir          Don't delete the temporary config dir after exit
+
     -l, --list-running      Show running instances
-    --lc, --list-clients <id|interface>     
+    --lc, --list-clients <id|interface>
                             List clients of an instance. Or list neighbors of
                             an interface, even if it isn't handled by us.
                             (passive mode)
     --stop <id>             Stop a running instance
         For <id> you can use PID or subnet interface name.
         You can get them with '--list-running'
-                
-Examples:
-    lnxrouter -i eth1
-    lnxrouter --ap wlan0 MyAccessPoint -p MyPassPhrase
-    lnxrouter -i eth1 --tp <transparent-proxy> --dns <dns-proxy>
 ```
 
 </details>