hostap: Allow to use Automatic Channel Selection (ACS)

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 71b204526c70fd60cb89cdd0002e2124105138ac..a3aeded57ebe2b4c43ad8546a1d86fea837d5631 100644 (file)
--- 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

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6a06fd3eb5ca99e19261b68b3d146608ac15e148..164e36dbb00e2cf24e9e206074507c74e245be4f 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1362,6 +1362,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 configuration = Access Point Configuration
 WARNING: untranslated string: wlanap country = Country Code
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 3d82cc542b36693a1c8bb0877082441a8637f3e9..df4f19eff7f7eac8a357eca0c778a5c471dd7d3f 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -880,3 +880,4 @@ 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

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 5ad189f8428dd18e59e1eaa99ee69e435a83ccea..b2df1499ea99310dc9cf1bf0e62ce1f224cc2289 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1030,6 +1030,7 @@ 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 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 fa53ed971d3f91352de4a27acee262c0e2a65580..fa2cea18ed7f73d513e8063e448a4667177c8959 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1076,6 +1076,7 @@ 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 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 6a06fd3eb5ca99e19261b68b3d146608ac15e148..164e36dbb00e2cf24e9e206074507c74e245be4f 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1362,6 +1362,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 configuration = Access Point Configuration
 WARNING: untranslated string: wlanap country = Country Code
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 10549e001d333be32f3a0ef3b5532cf6a986834e..da6fecb07365ff56f743d3741879c28c017b48eb 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1357,6 +1357,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 configuration = Access Point Configuration
 WARNING: untranslated string: wlanap country = Country Code
 WARNING: untranslated string: wlanap neighbor scan = Neighborhood scan

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 9a7dae8b82231089744ed24bd4d7afb1032bafe0..d18b14f01a3d570a05a836dfe9cc3281a88481a2 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -894,5 +894,6 @@ 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 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 112248713e352c2632773ebad482eac35095eb83..7e7ccfdde509df8cea92baedc1d476a5488a16c8 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -792,6 +792,7 @@
 < Weekly
 < wireless network
 < wlanap
+< wlanap auto
 < wlanap configuration
 < wlanap country
 < wlanap neighbor scan
@@ -902,6 +903,7 @@
 < transport mode does not support vti
 < update ruleset
 < Weekly
+< wlanap auto
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
@@ -1157,6 +1159,7 @@
 < Weekly
 < wireless network
 < wlanap
+< wlanap auto
 < wlanap configuration
 < wlanap neighbor scan
 < wlanap neighbor scan warning
@@ -1487,6 +1490,7 @@
 < Weekly
 < wireless network
 < wlanap
+< wlanap auto
 < wlanap configuration
 < wlanap neighbor scan
 < wlanap neighbor scan warning
@@ -2225,6 +2229,7 @@
 < Weekly
 < wireless network
 < wlanap
+< wlanap auto
 < wlanap configuration
 < wlanap country
 < wlanap neighbor scan
@@ -3001,6 +3006,7 @@
 < Weekly
 < wireless network
 < wlanap
+< wlanap auto
 < wlanap configuration
 < wlanap country
 < wlanap neighbor scan
@@ -3126,5 +3132,6 @@
 < vpn start action add
 < vpn wait
 < Weekly
+< wlanap auto
 < wlanap neighbor scan
 < wlanap neighbor scan warning

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 44b0b405327eef213765e2c92615bfc9ae61a0fb..5120e2eae7d4acee40af03a566350fa320844e09 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -270,7 +270,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 +285,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 +296,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 +414,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 {

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6479172d545fa0b36cc4f33d17fafd5960f996f8..4c61150cac66183d2805c3b18ce0c9332dc20798 100644 (file)
--- 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',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c053202b57ec6045267324877315c300cf8e8118..8e8fea059881f7de8af1f82f7672027585d91dc2 100644 (file)
--- 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',

diff --git a/lfs/hostapd b/lfs/hostapd
index 64ff28e4b1e0ffca5b0ce44928b91dcc1fec0a95..c2830b88a46db47353210f5bacfe5262cfd75dcc 100644 (file)
--- 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    = 46
 
 DEPS       = ""