public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH 1/3] hostapd: Add support for 802.11ac
@ 2018-10-06 16:36 Michael Tremer
  2018-10-06 16:36 ` [PATCH 2/3] hostapd: Compile with debugging messages Michael Tremer
  2018-10-06 16:36 ` [PATCH 3/3] hostapd: Bump package version Michael Tremer
  0 siblings, 2 replies; 4+ messages in thread
From: Michael Tremer @ 2018-10-06 16:36 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2036 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/wlanap.cgi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index bb40021cf..0abbf6d6e 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -73,6 +73,7 @@ $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
 $wlanapsettings{'DRIVER'} = 'NL80211';
 $wlanapsettings{'HTCAPS'} = '';
+$wlanapsettings{'VHTCAPS'} = '';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 &Header::getcgihash(\%wlanapsettings);
@@ -389,6 +390,7 @@ print<<END
 		<option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option>
 		<option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option>
 		<option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
+		<option value='ac' $selected{'HW_MODE'}{'ac'}>802.11ac</option>
 	</select>
 </td></tr>
 END
@@ -428,6 +430,7 @@ END
 ;
 print <<END
 <tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
+<tr><td width='25%' class='base'>VHT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='VHTCAPS' size='30' value='$wlanapsettings{'VHTCAPS'}' /></td></tr>
 <tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
 	<select name='SYSLOGLEVEL'>
@@ -577,6 +580,17 @@ ht_capab=$wlanapsettings{'HTCAPS'}
 END
 ;
 
+ }elsif ( $wlanapsettings{'HW_MODE'} eq 'ac' ){
+	print CONFIGFILE <<END
+hw_mode=a
+ieee80211ac=1
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+vht_capab=$wlanapsettings{'VHTCAPS'}
+END
+;
+
  }else{
  	print CONFIGFILE <<END
 hw_mode=$wlanapsettings{'HW_MODE'}
-- 
2.12.2


^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 1/3] hostapd: Add WPA3 authentication to the web UI
@ 2020-10-19 14:48 Michael Tremer
  2020-10-19 14:48 ` [PATCH 3/3] hostapd: Bump package version Michael Tremer
  0 siblings, 1 reply; 4+ messages in thread
From: Michael Tremer @ 2020-10-19 14:48 UTC (permalink / raw)
  To: development

[-- Attachment #1: Type: text/plain, Size: 2383 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/wlanap.cgi | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 2c28d50e5..29fdd1cd5 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -130,7 +130,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
 	# verify WPA Passphrase - only with enabled enc
-	if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+	if ($wlanapsettings{'ENC'} ne "none") {
 		# must be 8 .. 63 characters
 		if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
 			$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
@@ -442,7 +442,9 @@ print<<END
 		<option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option>
 		<option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option>
 		<option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option>
+		<option value='wpa3' $selected{'ENC'}{'wpa3'}>WPA3</option>
 		<option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
+		<option value='wpa2+3' $selected{'ENC'}{'wpa2+3'}>WPA2+3</option>
 	</select>
 </td></tr>
 <tr><td width='25%' class='base'>Passphrase:&nbsp;</td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr>
@@ -707,6 +709,16 @@ wpa_passphrase=$wlanapsettings{'PWD'}
 wpa_key_mgmt=WPA-PSK
 rsn_pairwise=CCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa3'){
+	print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=SAE
+rsn_pairwise=CCMP
+END
 ;
  } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){
 	print CONFIGFILE <<END
@@ -718,6 +730,16 @@ wpa_key_mgmt=WPA-PSK
 wpa_pairwise=TKIP
 rsn_pairwise=CCMP
 END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa2+3'){
+	print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK SAE
+rsn_pairwise=CCMP
+END
 ;
  }
 	close CONFIGFILE;
-- 
2.20.1


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-10-19 14:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-06 16:36 [PATCH 1/3] hostapd: Add support for 802.11ac Michael Tremer
2018-10-06 16:36 ` [PATCH 2/3] hostapd: Compile with debugging messages Michael Tremer
2018-10-06 16:36 ` [PATCH 3/3] hostapd: Bump package version Michael Tremer
2020-10-19 14:48 [PATCH 1/3] hostapd: Add WPA3 authentication to the web UI Michael Tremer
2020-10-19 14:48 ` [PATCH 3/3] hostapd: Bump package version Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox