[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d77b8843c75abb260be7f6952671445151dd3d76 - IPFire-SCM

29 Dec 2012

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  d77b8843c75abb260be7f6952671445151dd3d76 (commit)
       via  52b597b40cdaab9f4adaeb9d5a938a4c670f76d1 (commit)
       via  07c9b89f861e4fc08b8d8bea2207064a235641aa (commit)
       via  c3d9a16d5768bb4dbcdd731674c4bc48efab48e3 (commit)
      from  d81d4fa89c2e2e83100d1553191b3a22416957e7 (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 d77b8843c75abb260be7f6952671445151dd3d76
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Dec 29 18:17:10 2012 +0100
wpa_supplicant: update to 1.1.
commit 52b597b40cdaab9f4adaeb9d5a938a4c670f76d1
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Dec 29 18:16:44 2012 +0100
hostapd: update to 1.1.
commit 07c9b89f861e4fc08b8d8bea2207064a235641aa
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Dec 29 16:30:07 2012 +0100
modprobe.d condig: remove REGDOMAIN setting comment.
If the regdomain was set here it cannot changed later with iw reg set.
commit c3d9a16d5768bb4dbcdd731674c4bc48efab48e3
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Dec 29 16:20:16 2012 +0100
hostapd: add country selection and fix txpower display.
-----------------------------------------------------------------------
Summary of changes:
 config/etc/modprobe.d/cfg80211           |  1 -
 config/rootfiles/core/66/filelists/files |  1 +
 html/cgi-bin/wlanap.cgi                  | 39 +++++++++++++++++++++++++++++---
 langs/de/cgi-bin/de.pl                   |  1 +
 langs/en/cgi-bin/en.pl                   |  1 +
 lfs/hostapd                              |  6 ++---
 lfs/wpa_supplicant                       |  4 ++--
 src/initscripts/init.d/hostapd           |  5 ++++
 8 files changed, 49 insertions(+), 9 deletions(-)
Difference in files:

diff --git a/config/etc/modprobe.d/cfg80211 b/config/etc/modprobe.d/cfg80211
index 9e04ea6..e72bedd 100644
--- a/config/etc/modprobe.d/cfg80211
+++ b/config/etc/modprobe.d/cfg80211
@@ -1,2 +1 @@
-#options cfg80211 ieee80211_regdom=DE
 blacklist ieee80211
diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index 3f9acf5..bf51301 100644
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -1,5 +1,6 @@
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/issue
+etc/modprobe.d/cfg80211
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/halt
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 99c77e3..83d65db 100644
--- 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){
@@ -378,6 +401,16 @@ foreach $channel (@channellist){
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'>
 END
 ;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 05e1d85..ca5dbb3 100644
--- 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 f0fa2c2..ede4517 100644
--- 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/lfs/hostapd b/lfs/hostapd
index 01768b8..f29712a 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
include Config
-VER        = 1.0
+VER        = 1.1
THISAPP    = hostapd-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 22
+PAK_VER    = 23
DEPS       = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 236247a7bbd4f60d5fa3e99849d1ffc9
+$(DL_FILE)_MD5 = e3ace8306d066ab2d24b4c9f668e2dd7
install : $(TARGET)
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index ef539df..e8a67e0 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -24,7 +24,7 @@
include Config
-VER        = 1.0
+VER        = 1.1
THISAPP    = wpa_supplicant-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8650f6aa23646ef634402552d0669640
+$(DL_FILE)_MD5 = b29b9af02d7e092db8c5c8508de0e45c
install : $(TARGET)
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 3108339..c0b11e6 100644
--- 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
hooks/post-receive
--
IPFire 2.x development tree

    