From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d77b8843c75abb260be7f6952671445151dd3d76 Date: Sat, 29 Dec 2012 18:22:34 +0100 Message-ID: <20121229172235.0477A20082@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0189477078463397936==" List-Id: --===============0189477078463397936== 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, 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 Date: Sat Dec 29 18:17:10 2012 +0100 wpa_supplicant: update to 1.1. commit 52b597b40cdaab9f4adaeb9d5a938a4c670f76d1 Author: Arne Fitzenreiter Date: Sat Dec 29 18:16:44 2012 +0100 hostapd: update to 1.1. commit 07c9b89f861e4fc08b8d8bea2207064a235641aa Author: Arne Fitzenreiter Date: Sat Dec 29 16:30:07 2012 +0100 modprobe.d condig: remove REGDOMAIN setting comment. =20 If the regdomain was set here it cannot changed later with iw reg set. commit c3d9a16d5768bb4dbcdd731674c4bc48efab48e3 Author: Arne Fitzenreiter 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=3DDE 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 =3D (); my %netsettings=3D(); my %wlanapsettings=3D(); my $channel =3D ''; +my $country =3D ''; my $txpower =3D ''; =20 &General::readhash("${General::swroot}/main/settings", \%mainsettings); @@ -64,6 +65,7 @@ $wlanapsettings{'HIDESSID'} =3D 'off'; $wlanapsettings{'ENC'} =3D 'wpa2'; # none / wpa1 /wpa2 $wlanapsettings{'TXPOWER'} =3D 'auto'; $wlanapsettings{'CHANNEL'} =3D '05'; +$wlanapsettings{'COUNTRY'} =3D '00'; $wlanapsettings{'HW_MODE'} =3D 'g'; $wlanapsettings{'PWD'} =3D 'IPFire-2.x'; $wlanapsettings{'SYSLOGLEVEL'} =3D '0'; @@ -243,11 +245,17 @@ $checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} =3D "= checked=3D'checked'"; =20 $selected{'ENC'}{$wlanapsettings{'ENC'}} =3D "selected=3D'selected'"; $selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} =3D "selected=3D'selected'"; +$selected{'COUNTRY'}{$wlanapsettings{'COUNTRY'}} =3D "selected=3D'selected'"; $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} =3D "selected=3D'selected'"; $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} =3D "selected=3D'selected'"; $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} =3D "selected=3D'selected'"; =20 -my @channellist_cmd =3D `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/= null`; +my $monwlaninterface =3D $wlanapsettings{'INTERFACE'}; +if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ + $monwlaninterface =3D 'mon.'.$wlanapsettings{'INTERFACE'}; +} + +my @channellist_cmd =3D `iwlist $monwlaninterface channel 2>/dev/null`; # get available channels =20 my @temp; @@ -258,8 +266,23 @@ if ( $channel =3D~ /\d+/ ){push(@temp,$channel);} } my @channellist =3D @temp; =20 -my @txpower_cmd =3D `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null= `; -# get available channels +my @countrylist_cmd =3D `regdbdump /usr/lib/crda/regulatory.bin 2>/dev/null`; +# get available country codes + +my @temp; +foreach (@countrylist_cmd){ +$_ =3D~ /country (.*):/; +$country =3D $1;chomp $country; +if ( $country =3D~ /[0,A-Z][0,A-Z]/ ) {push(@temp,$country);} +} +my @countrylist =3D @temp; + +my @txpower_cmd =3D `iwlist $monwlaninterface txpower 2>/dev/null`; +if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){ + # There is a bug with NL80211 only all devices can displayed + @txpower_cmd =3D `iwlist txpower 2>/dev/null | sed -e "s|unknown transmit-p= ower information.||g"`; +} +# get available power =20 my @temp; foreach (@txpower_cmd){ @@ -378,6 +401,16 @@ foreach $channel (@channellist){ =20 print < +$Lang::tr{'wlanap country'}: = +