[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc850cb32fdfad60f669f4834f4b4b4b5af770a8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via dc850cb32fdfad60f669f4834f4b4b4b5af770a8 (commit) via 37a83c83cdff0fc652189792d73ee12dad10edcd (commit) via ea10f1a0b5f61ac9f762f38a72e58cc01c975bcf (commit) from fabe150953b5cacf1a1879c7d92bd47bb06a2869 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit dc850cb32fdfad60f669f4834f4b4b4b5af770a8 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 24 10:43:50 2019 +0100
hostap: Enable 80MHz bandwidth by default (when using ACS)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 37a83c83cdff0fc652189792d73ee12dad10edcd Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 24 10:39:25 2019 +0100
hostap: Enable option to force clients to use 802.11w
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ea10f1a0b5f61ac9f762f38a72e58cc01c975bcf Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 24 10:12:29 2019 +0100
hostap: Allow to use Automatic Channel Selection (ACS)
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.en | 2 ++ doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.it | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 14 ++++++++++++++ html/cgi-bin/wlanap.cgi | 38 ++++++++++++++++++++++++++++++++++---- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ lfs/hostapd | 2 +- 13 files changed, 69 insertions(+), 5 deletions(-)
Difference in files: diff --git a/doc/language_issues.en b/doc/language_issues.en index 71b204526..60df810d7 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -2164,6 +2164,7 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap channel = Channel WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code @@ -2175,6 +2176,7 @@ WARNING: untranslated string: wlanap interface = Select interface WARNING: untranslated string: wlanap invalid wpa = Invalid length in WPA Passphrase. Must be between 8 and 63 characters. WARNING: untranslated string: wlanap link dhcp = Wireless lan DHCP configuration WARNING: untranslated string: wlanap link wireless = Activate wireless lan clients +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! WARNING: untranslated string: wlanap no interface = Selected interface is not a wirless lan card! diff --git a/doc/language_issues.es b/doc/language_issues.es index 6a06fd3eb..439b1f546 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1362,7 +1362,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 3d82cc542..97cb27147 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -880,3 +880,5 @@ WARNING: untranslated string: system is offline = The system is offline. WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: vpn statistics n2n = unknown string +WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) diff --git a/doc/language_issues.it b/doc/language_issues.it index 5ad189f84..a5923b3dd 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1030,6 +1030,8 @@ WARNING: untranslated string: wlan client password = Password WARNING: untranslated string: wlan client tls cipher = TLS Cipher WARNING: untranslated string: wlan client tls version = TLS Version WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap configuration = Access Point Configuration +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.nl b/doc/language_issues.nl index fa53ed971..a180b675d 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1076,6 +1076,8 @@ WARNING: untranslated string: wlan client password = Password WARNING: untranslated string: wlan client tls cipher = TLS Cipher WARNING: untranslated string: wlan client tls version = TLS Version WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap configuration = Access Point Configuration +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6a06fd3eb..439b1f546 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1362,7 +1362,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 10549e001..d832d5560 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1357,7 +1357,9 @@ WARNING: untranslated string: wlan client wpa mode ccmp tkip = CCMP-TKIP WARNING: untranslated string: wlan client wpa mode tkip tkip = TKIP-TKIP WARNING: untranslated string: wlan clients = Wireless clients WARNING: untranslated string: wlanap = Access Point +WARNING: untranslated string: wlanap auto = Automatic Channel Selection WARNING: untranslated string: wlanap configuration = Access Point Configuration WARNING: untranslated string: wlanap country = Country Code +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 9a7dae8b8..1419af4b9 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -894,5 +894,7 @@ WARNING: untranslated string: update ruleset = Update ruleset WARNING: untranslated string: vpn start action add = Wait for connection initiation WARNING: untranslated string: vpn statistics n2n = unknown string WARNING: untranslated string: vpn wait = WAITING +WARNING: untranslated string: wlanap auto = Automatic Channel Selection +WARNING: untranslated string: wlanap management frame protection = Management Frame Protection (802.11w) WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan WARNING: untranslated string: wlanap neighbor scan warning = Warning! Disabling may violate regulatory rules! diff --git a/doc/language_missings b/doc/language_missings index 112248713..e41d14fb2 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -792,8 +792,10 @@ < Weekly < wireless network < wlanap +< wlanap auto < wlanap configuration < wlanap country +< wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning < wlan client @@ -902,6 +904,8 @@ < transport mode does not support vti < update ruleset < Weekly +< wlanap auto +< wlanap management frame protection ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1157,7 +1161,9 @@ < Weekly < wireless network < wlanap +< wlanap auto < wlanap configuration +< wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning < wlan client anonymous identity @@ -1487,7 +1493,9 @@ < Weekly < wireless network < wlanap +< wlanap auto < wlanap configuration +< wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning < wlan client anonymous identity @@ -2225,8 +2233,10 @@ < Weekly < wireless network < wlanap +< wlanap auto < wlanap configuration < wlanap country +< wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning < wlan client @@ -3001,8 +3011,10 @@ < Weekly < wireless network < wlanap +< wlanap auto < wlanap configuration < wlanap country +< wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning < wlan client @@ -3126,5 +3138,7 @@ < vpn start action add < vpn wait < Weekly +< wlanap auto +< wlanap management frame protection < wlanap neighbor scan < wlanap neighbor scan warning diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index 44b0b4053..a85e3e98e 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -76,6 +76,7 @@ $wlanapsettings{'HTCAPS'} = ''; $wlanapsettings{'VHTCAPS'} = ''; $wlanapsettings{'NOSCAN'} = 'off'; $wlanapsettings{'CLIENTISOLATION'} = 'off'; +$wlanapsettings{'IEEE80211W'} = 'off';
&General::readhash("/var/ipfire/wlanap/settings", %wlanapsettings); &Header::getcgihash(%wlanapsettings); @@ -257,6 +258,10 @@ $checked{'CLIENTISOLATION'}{'off'} = ''; $checked{'CLIENTISOLATION'}{'on'} = ''; $checked{'CLIENTISOLATION'}{$wlanapsettings{'CLIENTISOLATION'}} = "checked='checked'";
+$checked{'IEEE80211W'}{'off'} = ''; +$checked{'IEEE80211W'}{'on'} = ''; +$checked{'IEEE80211W'}{$wlanapsettings{'IEEE80211W'}} = "checked='checked'"; + $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'"; $selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'"; @@ -270,7 +275,7 @@ if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) { }
my @channellist_cmd; -my @channellist; +my @channellist = (0);
if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`; @@ -285,7 +290,7 @@ $_ =~ /(.*) [(\d+)(.*)]/; $channel = $2;chomp $channel; if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);} } -@channellist = @temp; +push(@channellist, @temp); } else { @channellist_cmd = `iwlist $monwlaninterface channel|tail -n +2 2>/dev/null`; # get available channels @@ -296,7 +301,7 @@ $_ =~ /(.*)Channel (\d+)(.*):/; $channel = $2;chomp $channel; if ( $channel =~ /\d+/ ){push(@temp,$channel + 0);} } -@channellist = @temp; +push(@channellist, @temp); }
my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`; @@ -414,7 +419,13 @@ if ( scalar @channellist > 0 ){ END ; foreach $channel (@channellist){ - print "<option $selected{'CHANNEL'}{$channel}>$channel</option>"; + print "<option $selected{'CHANNEL'}{$channel}>"; + if ($channel eq 0) { + print "- $Lang::tr{'wlanap auto'} -"; + } else { + print $channel; + } + print "</option>"; } print "</select></td></tr>" } else { @@ -437,6 +448,17 @@ print<<END </select> </td></tr> <tr><td width='25%' class='base'>Passphrase: </td><td class='base' colspan='3'><input type='text' name='PWD' size='30' value='$wlanapsettings{'PWD'}' /></td></tr> +<tr> + <td width='25%' class='base'>$Lang::tr{'wlanap management frame protection'}: </td> + <td class='base' colspan="3"> + <label> + $Lang::tr{'on'} <input type='radio' name='IEEE80211W' value='on' $checked{'IEEE80211W'}{'on'} /> + </label> | + <label> + <input type='radio' name='IEEE80211W' value='off' $checked{'IEEE80211W'}{'off'} /> $Lang::tr{'off'} + </label> + </td> +</tr> <tr><td colspan='4'><br></td></tr> END ; @@ -600,6 +622,7 @@ ieee80211n=1 wmm_enabled=1 ht_capab=$wlanapsettings{'HTCAPS'} vht_capab=$wlanapsettings{'VHTCAPS'} +vht_oper_chwidth=1 END ;
@@ -661,6 +684,13 @@ END
}
+ # Management Frame Protection (802.11w) + if ($wlanapsettings{'IEEE80211W'} eq "on") { + print CONFIGFILE "ieee80211w=2\n"; + } else { + print CONFIGFILE "ieee80211w=0\n"; + } + if ( $wlanapsettings{'ENC'} eq 'wpa1'){ print CONFIGFILE <<END ######################### wpa hostapd configuration ############################ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6479172d5..8b5723a12 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2839,6 +2839,7 @@ 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan clients' => 'WLAN-Clients', 'wlanap' => 'Access Point', +'wlanap auto' => 'Automatic Channel Selection', 'wlanap channel' => 'Kanal', 'wlanap configuration' => 'Access Point Konfiguration', 'wlanap country' => 'Ländercode', @@ -2850,6 +2851,7 @@ 'wlanap invalid wpa' => 'Ungültige Länge in WPA-Passphrase. Muss zwischen 8 und 63 Zeichen lang sein.', 'wlanap link dhcp' => 'Wireless Lan DHCP-Einstellungen', 'wlanap link wireless' => 'Wireless Lan Clients freischalten', +'wlanap management frame protection' => 'Management Frame Protection (802.11w)', 'wlanap neighbor scan' => 'Nachbarschaftsscan', 'wlanap neighbor scan warning' => 'Warnung! Deaktivierung kann gegen Funkregeln verstoßen.', 'wlanap no interface' => 'Ausgewähltes Interface ist keine WLAN-Karte!', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c053202b5..8ae154247 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2888,6 +2888,7 @@ 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan clients' => 'Wireless clients', 'wlanap' => 'Access Point', +'wlanap auto' => 'Automatic Channel Selection', 'wlanap channel' => 'Channel', 'wlanap configuration' => 'Access Point Configuration', 'wlanap country' => 'Country Code', @@ -2899,6 +2900,7 @@ 'wlanap invalid wpa' => 'Invalid length in WPA Passphrase. Must be between 8 and 63 characters.', 'wlanap link dhcp' => 'Wireless lan DHCP configuration', 'wlanap link wireless' => 'Activate wireless lan clients', +'wlanap management frame protection' => 'Management Frame Protection (802.11w)', 'wlanap neighbor scan' => 'Neighborhood scan', 'wlanap neighbor scan warning' => 'Warning! Disabling may violate regulatory rules!', 'wlanap no interface' => 'Selected interface is not a wirless lan card!', diff --git a/lfs/hostapd b/lfs/hostapd index 64ff28e4b..14932cccb 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 45 +PAK_VER = 48
DEPS = ""
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer