From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated.
 8e1259a31b148fce90ba56f8e4c3ca3e05b35bc1
Date: Tue, 08 Oct 2024 08:47:57 +0000
Message-ID: <4XN8mZ120Zz2xSd@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0141880984261615042=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0141880984261615042==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, master has been updated
       via  8e1259a31b148fce90ba56f8e4c3ca3e05b35bc1 (commit)
       via  6f7bbb38c9460e1f179f064d9e0a0b2cf4bf45da (commit)
       via  d56df86ce26d5c35a89ffde492a0eb708396ee7e (commit)
       via  375d1dc6dd46783900b9eb2f4fb3e3e25e7e0778 (commit)
       via  5474f9b32ffb2c41c89e30560919854584ed8169 (commit)
       via  b165dcdd803ba278013b1af03a8269f8994cb5f7 (commit)
       via  03a71cd52131be601e2fc5101e3425e82e654ec9 (commit)
       via  69bb956729ffc7268a40400cb1e01335ab919ea9 (commit)
       via  ff599dd2cb0d0cb9cac7019f1970b4d516bb2c36 (commit)
       via  5cee03da1e29e6cde5d4fe121b22b86768006775 (commit)
      from  01782a41f8feea008b92ea3e349c15dc7994588b (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 8e1259a31b148fce90ba56f8e4c3ca3e05b35bc1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Sep 29 18:03:58 2024 +0200

    hostapd: update to git 64d60bb4
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6f7bbb38c9460e1f179f064d9e0a0b2cf4bf45da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 14:12:07 2024 +0200

    wlanap.cgi: Fix copying configuration
   =20
    This allows to uncheck checkboxes again.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d56df86ce26d5c35a89ffde492a0eb708396ee7e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 13:55:40 2024 +0200

    wlanap.cgi: Change broadcast SSID to hide SSID
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 375d1dc6dd46783900b9eb2f4fb3e3e25e7e0778
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 13:19:10 2024 +0200

    wlanap.cgi: Default to channel 0 for ACS
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5474f9b32ffb2c41c89e30560919854584ed8169
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 13:17:59 2024 +0200

    wlanap.cgi: Enable Neighbourhood Scan by default
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit b165dcdd803ba278013b1af03a8269f8994cb5f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 13:16:44 2024 +0200

    wlanap.cgi: Don't try to show status if there is no interface
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 03a71cd52131be601e2fc5101e3425e82e654ec9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 13:13:41 2024 +0200

    wlanap.cgi: Correctly show broadcast SSID status
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 69bb956729ffc7268a40400cb1e01335ab919ea9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Sep 20 11:30:03 2024 +0100

    wlanap.cgi: Disable generating Perl warnings
   =20
    Reported-by: Waynie <waynet(a)ucpix.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ff599dd2cb0d0cb9cac7019f1970b4d516bb2c36
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Oct 8 08:43:39 2024 +0000

    core189: Ship rules.pl
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5cee03da1e29e6cde5d4fe121b22b86768006775
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 7 09:13:12 2024 +0000

    firewall: Flush SYN_FLOOD_PROTECTION
   =20
    This chain was not flushed when the firewall was being reloaded which
    made any ports appear as open when rules have been disabled or deleted.
   =20
    This has no security implications, but nevertheless isn't right.
   =20
    Reported-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/firewall/rules.pl                  |  1 +
 config/rootfiles/core/189/filelists/files |  1 +
 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                     | 12 ++---
 html/cgi-bin/wlanap.cgi                   | 75 ++++++++++++++++++++---------=
--
 langs/de/cgi-bin/de.pl                    |  2 +-
 langs/en/cgi-bin/en.pl                    |  2 +-
 lfs/hostapd                               | 10 ++---
 15 files changed, 76 insertions(+), 43 deletions(-)

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index e38f77242..c414f172c 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -221,6 +221,7 @@ sub flush {
 	run("$IPTABLES -t nat -F $CHAIN_NAT_SOURCE");
 	run("$IPTABLES -t nat -F $CHAIN_NAT_DESTINATION");
 	run("$IPTABLES -t mangle -F $CHAIN_MANGLE_NAT_DESTINATION_FIX");
+	run("$IPTABLES -t raw -F SYN_FLOOD_PROTECT");
 }
=20
 sub buildrules {
diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/cor=
e/189/filelists/files
index 7e7959886..1603622e7 100644
--- a/config/rootfiles/core/189/filelists/files
+++ b/config/rootfiles/core/189/filelists/files
@@ -8,6 +8,7 @@ srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/html/include/rrdimage.js
 usr/bin/suricata-watcher
+usr/lib/firewall/rules.pl
 var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/ids-functions.pl
diff --git a/doc/language_issues.en b/doc/language_issues.en
index c762cc6f7..0e3a3eb74 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -2351,13 +2351,13 @@ WARNING: untranslated string: wlanap 802.11w disabled=
 =3D Disabled
 WARNING: untranslated string: wlanap 802.11w enforced =3D Enforced
 WARNING: untranslated string: wlanap 802.11w optional =3D Optional
 WARNING: untranslated string: wlanap auto =3D Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid =3D Broadcast SSID
 WARNING: untranslated string: wlanap channel =3D Channel
 WARNING: untranslated string: wlanap client isolation =3D Client Isolation
 WARNING: untranslated string: wlanap clients =3D unknown string
 WARNING: untranslated string: wlanap configuration =3D Wireless Access Point=
 Configuration
 WARNING: untranslated string: wlanap country =3D Country Code
 WARNING: untranslated string: wlanap encryption =3D Encryption
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap interface =3D Select Interface
 WARNING: untranslated string: wlanap invalid wpa =3D Invalid length in WPA p=
assphrase. Must be between 8 and 63 characters.
 WARNING: untranslated string: wlanap management frame protection =3D Managem=
ent Frame Protection (802.11w)
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 67f82a450..b33ffa2dc 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -940,6 +940,7 @@ WARNING: translation string unused: wins server
 WARNING: translation string unused: wins support
 WARNING: translation string unused: wlan clients
 WARNING: translation string unused: wlanap access point
+WARNING: translation string unused: wlanap broadcast ssid
 WARNING: translation string unused: wlanap debugging
 WARNING: translation string unused: wlanap del interface
 WARNING: translation string unused: wlanap informations
@@ -1197,5 +1198,6 @@ WARNING: untranslated string: wireguard =3D WireGuard
 WARNING: untranslated string: wlan client configuration =3D Wireless Client =
Configuration
 WARNING: untranslated string: wlanap =3D Wireless Access Point
 WARNING: untranslated string: wlanap clients =3D unknown string
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap psk =3D Pre-Shared Key
 WARNING: untranslated string: wlanap wireless mode =3D Wireless Mode
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index db8b6071e..93466bd9e 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -909,6 +909,7 @@ WARNING: translation string unused: wildcards
 WARNING: translation string unused: wins server
 WARNING: translation string unused: wins support
 WARNING: translation string unused: wlan clients
+WARNING: translation string unused: wlanap broadcast ssid
 WARNING: translation string unused: wlanap debugging
 WARNING: translation string unused: wlanap del interface
 WARNING: translation string unused: wlanap informations
@@ -1133,5 +1134,6 @@ WARNING: untranslated string: wio_webinterface =3D unkn=
own string
 WARNING: untranslated string: wio_webinterface_link =3D unknown string
 WARNING: untranslated string: wireguard =3D WireGuard
 WARNING: untranslated string: wlanap clients =3D unknown string
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap psk =3D Pre-Shared Key
 WARNING: untranslated string: wlanap wireless mode =3D Wireless Mode
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 553417e59..426df7759 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1504,10 +1504,10 @@ WARNING: untranslated string: wlanap 802.11w disabled=
 =3D Disabled
 WARNING: untranslated string: wlanap 802.11w enforced =3D Enforced
 WARNING: untranslated string: wlanap 802.11w optional =3D Optional
 WARNING: untranslated string: wlanap auto =3D Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid =3D Broadcast SSID
 WARNING: untranslated string: wlanap client isolation =3D Client Isolation
 WARNING: untranslated string: wlanap clients =3D unknown string
 WARNING: untranslated string: wlanap configuration =3D Wireless Access Point=
 Configuration
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap management frame protection =3D Managem=
ent Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan =3D Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning =3D Warning: Disa=
bling may violate regulatory rules
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 0b16d098d..046e5943b 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1527,10 +1527,10 @@ WARNING: untranslated string: wlanap 802.11w disabled=
 =3D Disabled
 WARNING: untranslated string: wlanap 802.11w enforced =3D Enforced
 WARNING: untranslated string: wlanap 802.11w optional =3D Optional
 WARNING: untranslated string: wlanap auto =3D Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid =3D Broadcast SSID
 WARNING: untranslated string: wlanap client isolation =3D Client Isolation
 WARNING: untranslated string: wlanap clients =3D unknown string
 WARNING: untranslated string: wlanap configuration =3D Wireless Access Point=
 Configuration
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap management frame protection =3D Managem=
ent Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan =3D Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning =3D Warning: Disa=
bling may violate regulatory rules
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a3acd734f..f0a60ab30 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1797,11 +1797,11 @@ WARNING: untranslated string: wlanap 802.11w disabled=
 =3D Disabled
 WARNING: untranslated string: wlanap 802.11w enforced =3D Enforced
 WARNING: untranslated string: wlanap 802.11w optional =3D Optional
 WARNING: untranslated string: wlanap auto =3D Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid =3D Broadcast SSID
 WARNING: untranslated string: wlanap client isolation =3D Client Isolation
 WARNING: untranslated string: wlanap clients =3D unknown string
 WARNING: untranslated string: wlanap configuration =3D Wireless Access Point=
 Configuration
 WARNING: untranslated string: wlanap country =3D Country Code
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap management frame protection =3D Managem=
ent Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan =3D Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning =3D Warning: Disa=
bling may violate regulatory rules
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 66b6cae13..a8f2c1549 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1790,11 +1790,11 @@ WARNING: untranslated string: wlanap 802.11w disabled=
 =3D Disabled
 WARNING: untranslated string: wlanap 802.11w enforced =3D Enforced
 WARNING: untranslated string: wlanap 802.11w optional =3D Optional
 WARNING: untranslated string: wlanap auto =3D Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid =3D Broadcast SSID
 WARNING: untranslated string: wlanap client isolation =3D Client Isolation
 WARNING: untranslated string: wlanap clients =3D unknown string
 WARNING: untranslated string: wlanap configuration =3D Wireless Access Point=
 Configuration
 WARNING: untranslated string: wlanap country =3D Country Code
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap management frame protection =3D Managem=
ent Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan =3D Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning =3D Warning: Disa=
bling may violate regulatory rules
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index ec657539f..93619c0a4 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1372,9 +1372,9 @@ WARNING: untranslated string: wlanap 802.11w disabled =
=3D Disabled
 WARNING: untranslated string: wlanap 802.11w enforced =3D Enforced
 WARNING: untranslated string: wlanap 802.11w optional =3D Optional
 WARNING: untranslated string: wlanap auto =3D Automatic Channel Selection
-WARNING: untranslated string: wlanap broadcast ssid =3D Broadcast SSID
 WARNING: untranslated string: wlanap client isolation =3D Client Isolation
 WARNING: untranslated string: wlanap clients =3D unknown string
+WARNING: untranslated string: wlanap hide ssid =3D Hide SSID
 WARNING: untranslated string: wlanap management frame protection =3D Managem=
ent Frame Protection (802.11w)
 WARNING: untranslated string: wlanap neighbor scan =3D Neighborhood Scan
 WARNING: untranslated string: wlanap neighbor scan warning =3D Warning: Disa=
bling may violate regulatory rules
diff --git a/doc/language_missings b/doc/language_missings
index 6a44630bd..2a2333d94 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -167,6 +167,7 @@
 < whitelisted
 < wireguard
 < wlanap
+< wlanap hide ssid
 < wlanap psk
 < wlanap wireless mode
 < wlanap wlan clients
@@ -203,6 +204,7 @@
 < wg
 < whitelisted
 < wireguard
+< wlanap hide ssid
 < wlanap psk
 < wlanap wireless mode
 < wlanap wlan clients
@@ -702,9 +704,9 @@
 < wlanap 802.11w enforced
 < wlanap 802.11w optional
 < wlanap auto
-< wlanap broadcast ssid
 < wlanap client isolation
 < wlanap configuration
+< wlanap hide ssid
 < wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
@@ -1271,9 +1273,9 @@
 < wlanap 802.11w enforced
 < wlanap 802.11w optional
 < wlanap auto
-< wlanap broadcast ssid
 < wlanap client isolation
 < wlanap configuration
+< wlanap hide ssid
 < wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
@@ -2255,10 +2257,10 @@
 < wlanap 802.11w enforced
 < wlanap 802.11w optional
 < wlanap auto
-< wlanap broadcast ssid
 < wlanap client isolation
 < wlanap configuration
 < wlanap country
+< wlanap hide ssid
 < wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
@@ -3276,10 +3278,10 @@
 < wlanap 802.11w enforced
 < wlanap 802.11w optional
 < wlanap auto
-< wlanap broadcast ssid
 < wlanap client isolation
 < wlanap configuration
 < wlanap country
+< wlanap hide ssid
 < wlanap management frame protection
 < wlanap neighbor scan
 < wlanap neighbor scan warning
@@ -3672,8 +3674,8 @@
 < wlanap 802.11w enforced
 < wlanap 802.11w optional
 < wlanap auto
-< wlanap broadcast ssid
 < wlanap client isolation
+< wlanap hide ssid
 < 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 4de4c579c..2691496ab 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -22,8 +22,8 @@
 use strict;
=20
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
=20
 require '/var/ipfire/general-functions.pl';
 require '/var/ipfire/lang.pl';
@@ -34,6 +34,9 @@ my %selected=3D();
 my %checked=3D();
 my %wlanapsettings=3D();
=20
+# Read the configuration file
+&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+
 # Set defaults
 &General::set_defaults(\%wlanapsettings, {
 	"APMODE" =3D> "on",
@@ -41,22 +44,24 @@ my %wlanapsettings=3D();
 	"HIDESSID" =3D> "off",
 	"ENC" =3D> "wpa2",
 	"TXPOWER" =3D> "auto",
-	"CHANNEL" =3D> "6",
+	"CHANNEL" =3D> "0",
 	"COUNTRY" =3D> "00",
 	"HW_MODE" =3D> "g",
 	"PWD" =3D> "",
 	"HTCAPS" =3D> "",
 	"VHTCAPS" =3D> "",
-	"NOSCAN" =3D> "off",
+	"NOSCAN" =3D> "on",
 	"CLIENTISOLATION" =3D> "off",
 	"IEEE80211W" =3D> "off",
 });
=20
-&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-&Header::getcgihash(\%wlanapsettings);
+my %cgiparams =3D ();
+
+# Fetch arguments from browser
+&Header::getcgihash(\%cgiparams);
=20
 # Find the selected interface
-my $INTF =3D &Network::get_intf_by_address($wlanapsettings{'INTERFACE'});
+my $INTF =3D &Network::get_intf_by_address($cgiparams{'INTERFACE'});
=20
 delete $wlanapsettings{'__CGI__'};
 delete $wlanapsettings{'x'};
@@ -64,20 +69,36 @@ delete $wlanapsettings{'y'};
=20
 &Header::showhttpheaders();
=20
-if ($wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}") {
+if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
 	# verify WPA Passphrase - only with enabled enc
-	if ($wlanapsettings{'ENC'} ne "none") {
+	if ($cgiparams{'ENC'} ne "none") {
 		# must be 8 .. 63 characters
-		if ((length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}=
) > 63)) {
+		if ((length($cgiparams{'PWD'}) < 8) || (length($cgiparams{'PWD'}) > 63)) {
 			$errormessage .=3D "$Lang::tr{'wlanap invalid wpa'}<br />";
 		}
=20
 		# only ASCII alowed
-		if (!($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/)) {
+		if (!($cgiparams{'PWD'} !~ /[^\x00-\x7f]/)) {
 			$errormessage .=3D "$Lang::tr{'wlanap invalid wpa'}<br />";
 		}
 	}
=20
+	# XXX This needs validation
+	$wlanapsettings{'INTERFACE'} =3D $cgiparams{'INTERFACE'};
+	$wlanapsettings{'SSID'} =3D $cgiparams{'SSID'};
+	$wlanapsettings{'HIDESSID'} =3D ($cgiparams{'HIDESSID'} eq 'on') ? 'on' : '=
off';
+	$wlanapsettings{'CLIENTISOLATION'} =3D ($cgiparams{'CLIENTISOLATION'} eq 'o=
n') ? 'on' : 'off';
+	$wlanapsettings{'COUNTRY'} =3D $cgiparams{'COUNTRY'};
+	$wlanapsettings{'HW_MODE'} =3D $cgiparams{'HW_MODE'};
+	$wlanapsettings{'CHANNEL'} =3D $cgiparams{'CHANNEL'};
+	$wlanapsettings{'NOSCAN'} =3D ($cgiparams{'NOSCAN'} eq 'on') ? 'on' : 'off';
+	$wlanapsettings{'ENC'} =3D $cgiparams{'ENC'};
+	$wlanapsettings{'PWD'} =3D $cgiparams{'PWD'};
+	$wlanapsettings{'IEEE80211W'} =3D ($cgiparams{'IEEE80211W'} eq 'on') ? 'on'=
 : 'off';
+	$wlanapsettings{'HTCAPS'} =3D $cgiparams{'HTCAPS'};
+	$wlanapsettings{'VHTCAPS'} =3D $cgiparams{'VHTCAPS'};
+	$wlanapsettings{'TX_POWER'} =3D $cgiparams{'TX_POWER'};
+
 	if ($errormessage eq '') {
 		&General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
 		&WriteConfig_hostapd();
@@ -211,7 +232,7 @@ print <<END;
 			</tr>
=20
 			<tr>
-				<td>$Lang::tr{'wlanap broadcast ssid'}</td>
+				<td>$Lang::tr{'wlanap hide ssid'}</td>
 				<td>
 					<input type=3D'checkbox' name=3D'HIDESSID' $checked{'HIDESSID'}{'on'}>
 				</td>
@@ -354,29 +375,33 @@ END
=20
 &Header::closebox();
=20
-&Header::opensection();
+if ($INTF) {
=20
-my @status =3D `iw dev $INTF info`;
+	&Header::opensection();
=20
-if (@status) {
-	print <<END;
-		<h6>$Lang::tr{'wlanap wlan status'}</h6>
+	my @status =3D `iw dev $INTF info`;
=20
-		<pre>@status</pre>
+	if (@status) {
+		print <<END;
+			<h6>$Lang::tr{'wlanap wlan status'}</h6>
+
+			<pre>@status</pre>
 END
-}
+	}
=20
-my @status =3D `iw dev $INTF station dump`;
+	@status =3D `iw dev $INTF station dump`;
=20
-if (@status) {
-	print <<END;
-		<h6>$Lang::tr{'wlanap clients'}</h6>
+	if (@status) {
+		print <<END;
+			<h6>$Lang::tr{'wlanap clients'}</h6>
=20
-		<pre>@status</pre>
+			<pre>@status</pre>
 END
+	}
+
+	&Header::closesection();
 }
=20
-&Header::closesection();
 &Header::closebigbox();
 &Header::closepage();
=20
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0598952ca..61288dddf 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2998,7 +2998,6 @@
 'wlan clients' =3D> 'WLAN-Clients',
 'wlanap' =3D> 'Access Point',
 'wlanap auto' =3D> 'Automatic Channel Selection',
-'wlanap broadcast ssid' =3D> 'SSID =C3=BCbertragen',
 'wlanap channel' =3D> 'Kanal',
 'wlanap client isolation' =3D> 'Client-Isolierung',
 'wlanap configuration' =3D> 'Access Point Konfiguration',
@@ -3006,6 +3005,7 @@
 'wlanap debugging' =3D> 'Debugging',
 'wlanap del interface' =3D> 'Ausgew=C3=A4hltes Interface zur=C3=BCcksetzen?',
 'wlanap encryption' =3D> 'Verschl=C3=BCsselung',
+'wlanap hide ssid' =3D> 'SSID verbergen',
 'wlanap informations' =3D> 'Informationen',
 'wlanap interface' =3D> 'Interface =C3=BCbernehmen',
 'wlanap invalid wpa' =3D> 'Ung=C3=BCltige L=C3=A4nge in WPA-Passphrase. Muss=
 zwischen 8 und 63 Zeichen lang sein.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 91ea2e64a..d73655560 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -3090,7 +3090,6 @@
 'wlanap 802.11w enforced' =3D> 'Enforced',
 'wlanap 802.11w optional' =3D> 'Optional',
 'wlanap auto' =3D> 'Automatic Channel Selection',
-'wlanap broadcast ssid' =3D> 'Broadcast SSID',
 'wlanap channel' =3D> 'Channel',
 'wlanap client isolation' =3D> 'Client Isolation',
 'wlanap configuration' =3D> 'Wireless Access Point Configuration',
@@ -3098,6 +3097,7 @@
 'wlanap debugging' =3D> 'Debugging',
 'wlanap del interface' =3D> 'Remove selected interface?',
 'wlanap encryption' =3D> 'Encryption',
+'wlanap hide ssid' =3D> 'Hide SSID',
 'wlanap informations' =3D> 'Information',
 'wlanap interface' =3D> 'Select Interface',
 'wlanap invalid wpa' =3D> 'Invalid length in WPA passphrase. Must be between=
 8 and 63 characters.',
diff --git a/lfs/hostapd b/lfs/hostapd
index 2efa5a605..306b32641 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -25,15 +25,15 @@
 include Config
=20
 SUMMARY    =3D Daemon for running a WPA capable Access Point
-VER        =3D 2_11
+VER        =3D 64d60bb4
=20
-THISAPP    =3D hostap_$(VER)
-DL_FILE    =3D $(THISAPP).tar.bz2
+THISAPP    =3D hostap-$(VER)
+DL_FILE    =3D $(THISAPP).tar.xz
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D hostapd
-PAK_VER    =3D 64
+PAK_VER    =3D 66
=20
 DEPS       =3D
=20
@@ -47,7 +47,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D de98a3634ff937b0068329219e4fa5dece34c9eeb27fa81a9e7de6=
89d5dd2936ceb0ea43923a0e994e0a7bfcd71709b5f739df2f3efdd7c6ec5c765171711a19
+$(DL_FILE)_BLAKE2 =3D a377efb1f173a8622ca7ba2073161a64ea3a041c2c662ef35615e7=
4b61e29da2d1f7dccba68a8f2ae1a80c7d3fbde08cd9d72a0babf85324efa9b3b11b1cb3ac
=20
 install : $(TARGET)
=20


hooks/post-receive
--
IPFire 2.x development tree

--===============0141880984261615042==--