Merge pull request #362 from Catty2014/master

Add 802.11ax(wifi6) ability
lakinduakash · Dec 30, 2023 · d73242a · d73242a
2 parents 2dc1649 + 38e4828
commit d73242a
Show file tree

Hide file tree

Showing 9 changed files with 261 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@
 * Customise wifi Channel, Change MAC address, etc.
 * Hide SSID
 * customize gateway IP address
-* Enable IEEE 80211n, IEEE 80211ac modes
+* Enable IEEE 80211n, IEEE 80211ac and IEEE 80211ax modes
 
 ![screenshot](docs/sc4.png)
 

diff --git a/src/scripts/bash_completion b/src/scripts/bash_completion
@@ -70,6 +70,12 @@ _create_ap() {
         --ieee80211n)
             # No Options
             ;;
+        --ieee80211ac)
+            # No Options
+            ;;
+        --ieee80211ax)
+            # No Options
+            ;;
         --ht_capab)
             # Refer http://w1.fi/cgit/hostap/plain/hostapd/hostapd.conf
             opts='

diff --git a/src/scripts/create_ap b/src/scripts/create_ap
@@ -14,7 +14,7 @@
 #    dnsmasq
 #    iptables
 
-VERSION=0.4.7
+VERSION=0.4.8
 PROGNAME="$(basename $0)"
 
 # make sure that all command outputs are in english
@@ -50,6 +50,7 @@ usage() {
     echo "  --isolate-clients       Disable communication between clients"
     echo "  --ieee80211n            Enable IEEE 802.11n (HT)"
     echo "  --ieee80211ac           Enable IEEE 802.11ac (VHT)"
+    echo "  --ieee80211ax           Enable IEEE 802.11ax (VHT)"
     echo "  --ht_capab <HT>         HT capabilities (default: [HT40+])"
     echo "  --vht_capab <VHT>       VHT capabilities"
     echo "  --country <code>        Set two-letter country code for regularity (example: US)"
@@ -649,6 +650,7 @@ ISOLATE_CLIENTS=0
 SHARE_METHOD=nat
 IEEE80211N=0
 IEEE80211AC=0
+IEEE80211AX=0
 HT_CAPAB='[HT40+]'
 VHT_CAPAB=
 DRIVER=nl80211
@@ -666,7 +668,7 @@ HOSTAPD_DEBUG_ARGS=
 REDIRECT_TO_LOCALHOST=0
 
 CONFIG_OPTS=(CHANNEL GATEWAY WPA_VERSION ETC_HOSTS DHCP_DNS NO_DNS NO_DNSMASQ HIDDEN MAC_FILTER MAC_FILTER_ACCEPT ISOLATE_CLIENTS
-             SHARE_METHOD IEEE80211N IEEE80211AC HT_CAPAB VHT_CAPAB DRIVER NO_VIRT COUNTRY FREQ_BAND
+             SHARE_METHOD IEEE80211N IEEE80211AC IEEE80211AX HT_CAPAB VHT_CAPAB DRIVER NO_VIRT COUNTRY FREQ_BAND
              NEW_MACADDR DAEMONIZE DAEMON_PIDFILE DAEMON_LOGFILE NO_HAVEGED WIFI_IFACE INTERNET_IFACE
              SSID PASSPHRASE USE_PSK ADDN_HOSTS)
 
@@ -1070,7 +1072,7 @@ for ((i=0; i<$#; i++)); do
     fi
 done
 
-GETOPT_ARGS=$(getopt -o hc:w:g:de:nm: -l "help","hidden","hostapd-debug:","hostapd-timestamps","redirect-to-localhost","mac-filter","mac-filter-accept:","isolate-clients","ieee80211n","ieee80211ac","ht_capab:","vht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","dhcp-dns:","daemon","pidfile:","logfile:","stop:","list","list-running","list-clients:","version","psk","no-haveged","no-dns","no-dnsmasq","mkconfig:","config:" -n "$PROGNAME" -- "$@")
+GETOPT_ARGS=$(getopt -o hc:w:g:de:nm: -l "help","hidden","hostapd-debug:","hostapd-timestamps","redirect-to-localhost","mac-filter","mac-filter-accept:","isolate-clients","ieee80211n","ieee80211ac","ieee80211ax","ht_capab:","vht_capab:","driver:","no-virt","fix-unmanaged","country:","freq-band:","mac:","dhcp-dns:","daemon","pidfile:","logfile:","stop:","list","list-running","list-clients:","version","psk","no-haveged","no-dns","no-dnsmasq","mkconfig:","config:" -n "$PROGNAME" -- "$@")
 [[ $? -ne 0 ]] && exit 1
 eval set -- "$GETOPT_ARGS"
 
@@ -1143,6 +1145,10 @@ while :; do
             shift
             IEEE80211AC=1
             ;;
+	--ieee80211ax)
+	    shift
+	    IEEE80211AX=1
+	    ;;
         --ht_capab)
             shift
             HT_CAPAB="$1"
@@ -1711,6 +1717,10 @@ if [[ $IEEE80211AC -eq 1 ]]; then
     echo "ieee80211ac=1" >> $CONFDIR/hostapd.conf
 fi
 
+if [[ $IEEE80211AX -eq 1 ]]; then
+    echo "ieee80211ax=1" >> $CONFDIR/hostapd.conf
+fi
+
 if [[ -n "$VHT_CAPAB" ]]; then
     echo "vht_capab=${VHT_CAPAB}" >> $CONFDIR/hostapd.conf
 fi

diff --git a/src/scripts/create_ap.conf b/src/scripts/create_ap.conf
@@ -12,6 +12,7 @@ ISOLATE_CLIENTS=0
 SHARE_METHOD=nat
 IEEE80211N=0
 IEEE80211AC=0
+IEEE80211AX=0
 HT_CAPAB=[HT40+]
 VHT_CAPAB=
 DRIVER=nl80211

diff --git a/src/ui/glade/wifih.ui b/src/ui/glade/wifih.ui
diff --git a/src/ui/h_prop.c b/src/ui/h_prop.c
@@ -136,6 +136,10 @@ const char *build_wh_mkconfig_command(ConfigValues* cv){
         strcat(cmd_mkconfig," --ieee80211ac ");
     }
 
+    if(cv->ieee80211ax!=NULL && (strcmp(cv->ieee80211ax,"1") == 0)){
+        strcat(cmd_mkconfig," --ieee80211ax ");
+    }
+
     if(cv->mac!=NULL) {
         strcat(cmd_mkconfig, " --mac ");
         strcat(cmd_mkconfig, cv->mac);

diff --git a/src/ui/read_config.cpp b/src/ui/read_config.cpp
@@ -133,6 +133,9 @@ static void setConfigValues(const char * key, char *value){
 
     if( !strcmp ( IEEE80211AC, key ))
         configValues.ieee80211ac = value;
+
+    if( !strcmp ( IEEE80211AX, key ))
+        configValues.ieee80211ax = value;
 
     if( !strcmp ( GATEWAY, key ))
         configValues.gateway = value;

diff --git a/src/ui/read_config.h b/src/ui/read_config.h
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define SHARE_METHOD     "SHARE_METHOD"
 #define IEEE80211N       "IEEE80211N"
 #define IEEE80211AC      "IEEE80211AC"
+#define IEEE80211AX      "IEEE80211AX"
 #define HT_CAPAB         "HT_CAPAB"
 #define VHT_CAPAB        "VHT_CAPAB"
 #define DRIVER           "DRIVER"
@@ -91,6 +92,7 @@ typedef struct{
     char *accepted_macs;
     char *ieee80211n;
     char *ieee80211ac;
+    char *ieee80211ax;
     char *no_haveged;
     char *gateway;
 } ConfigValues;

diff --git a/src/ui/ui.c b/src/ui/ui.c
@@ -98,6 +98,7 @@ GtkCheckButton *cb_open;
 GtkCheckButton *cb_mac_filter;
 GtkCheckButton *cb_ieee80211n;
 GtkCheckButton *cb_ieee80211ac;
+GtkCheckButton *cb_ieee80211ax;
 
 GtkProgressBar *progress_bar;
 
@@ -440,6 +441,7 @@ int initUi(int argc, char *argv[]){
     cb_mac_filter = (GtkCheckButton *) gtk_builder_get_object(builder, "cb_mac_filter");
     cb_ieee80211n = (GtkCheckButton *) gtk_builder_get_object(builder, "cb_ieee80211n");
     cb_ieee80211ac= (GtkCheckButton *) gtk_builder_get_object(builder, "cb_ieee80211ac");
+    cb_ieee80211ax= (GtkCheckButton *) gtk_builder_get_object(builder, "cb_ieee80211ax");
 
     rb_freq_auto = (GtkRadioButton *) gtk_builder_get_object(builder, "rb_freq_auto");
     rb_freq_2 = (GtkRadioButton *) gtk_builder_get_object(builder, "rb_freq_2");
@@ -557,6 +559,11 @@ void init_ui_from_config(){
             gtk_toggle_button_set_active((GtkToggleButton*) cb_ieee80211ac,TRUE);
         }
 
+        if(strcmp(values->ieee80211ax,"1")==0){
+
+            gtk_toggle_button_set_active((GtkToggleButton*) cb_ieee80211ax,TRUE);
+        }
+
         if(strcmp(values->channel,"")!=0 && strcmp(values->channel,"default")!=0){
             gtk_toggle_button_set_active((GtkToggleButton*) cb_channel,TRUE);
             gtk_entry_set_text(entry_channel,values->channel);
@@ -943,6 +950,11 @@ static int init_config_val_input(ConfigValues* cv){
         else
             cv->ieee80211ac =NULL;
 
+        if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_ieee80211ax)))
+            cv->ieee80211ax = "1";
+        else
+            cv->ieee80211ax =NULL;
+
         if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cb_mac_filter))){
 
             cv->mac_filter = "1";