hostapd: add country selection and fix txpower display.

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 99c77e32d9632d7ccd0404c23f302f6742dd0494..83d65dbdb478efb5f2c3baf6774ae701fc3c8b79 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -49,6 +49,7 @@ my %mainsettings = ();
 my %netsettings=();
 my %wlanapsettings=();
 my $channel = '';
+my $country = '';
 my $txpower = '';
 
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
@@ -64,6 +65,7 @@ $wlanapsettings{'HIDESSID'} = 'off';
 $wlanapsettings{'ENC'} = 'wpa2';               # none / wpa1 /wpa2
 $wlanapsettings{'TXPOWER'} = 'auto';
 $wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'COUNTRY'} = '00';
 $wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
@@ -243,11 +245,17 @@ $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
 
 $selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
 $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "selected='selected'";
+$selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} = "selected='selected'";
 $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
 $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'";
 $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
 
-my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`;
+my $monwlaninterface = $wlanapsettings{'INTERFACE'};
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+       $monwlaninterface =  'mon.'.$wlanapsettings{'INTERFACE'};
+}
+
+my @channellist_cmd = `iwlist $monwlaninterface channel 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -258,8 +266,23 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);}
 }
 my @channellist = @temp;
 
-my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`;
-# get available channels
+my @countrylist_cmd = `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`;
+# get available country codes
+
+my @temp;
+foreach (@countrylist_cmd){
+$_ =~ /country (.*):/;
+$country = $1;chomp $country;
+if ( $country =~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);}
+}
+my @countrylist = @temp;
+
+my @txpower_cmd = `iwlist $monwlaninterface txpower 2>/dev/null`;
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+       # There is a bug with NL80211 only all devices can displayed
+       @txpower_cmd = `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-power information.||g"`;
+}
+# get available power
 
 my @temp;
 foreach (@txpower_cmd){
@@ -376,6 +399,16 @@ foreach $channel (@channellist){
        print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
 }
 
+print <<END
+</select></td></tr>
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}:&nbsp;</td><td class='base' colspan='3'>
+       <select name='COUNTRY'>
+END
+;
+foreach $country (@countrylist){
+       print "<option $selected{'COUNTRY'}{$country}>$country</option>";
+}
+
 print <<END
 </select></td></tr>
 <tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 05e1d8531dbfbbaab382613e49fa4249de836b06..ca5dbb3f86323e159b2c3f542ebc9516716e2aee 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2201,6 +2201,7 @@
 'wireless config changed' => 'Wireless Konfiguration geändert',
 'wireless configuration' => 'Wireless-Konfiguration',
 'wlanap access point' => 'Access Point',
+'wlanap country' => 'Ländercode',
 'wlanap channel' => 'Kanal',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Ausgewähltes Interface zurücksetzen?',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f0fa2c21f150e1e4fcd019d71978b2e96fbd8956..ede45179fcd5017fc53f688b6528182501daa984 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2234,6 +2234,7 @@
 'wireless config changed' => 'Wireless config changed',
 'wireless configuration' => 'Wireless Configuration',
 'wlanap access point' => 'Access Point',
+'wlanap country' => 'Country Code',
 'wlanap channel' => 'Channel',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Remove selected interface?',

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 31083399b18f83ce6191fbe597f3b9e45717dd1d..c0b11e6af6ee7f4c004120eefeb681abeddbd9c2 100644 (file)
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -3,6 +3,7 @@
 . ${rc_functions}
 
 CHANNEL="05"
+COUNTRY="00"
 TXPOWER="auto"
 INTERFACE="blue0"
 MACMODE="0"
@@ -74,6 +75,10 @@ case "${1}" in
                        fi
                fi
 
+               # First reset to World (00) and then set new country
+               /usr/sbin/iw reg set 00
+               /usr/sbin/iw reg set $COUNTRY
+
                /usr/sbin/iwconfig $INTERFACE channel $CHANNEL 2>/dev/null
                /usr/sbin/iwconfig $INTERFACE txpower $TXPOWER