Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / wlanap.cgi

diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 0bb42ae312440c33525a169b2ef415f43cf731aa..83d65dbdb478efb5f2c3baf6774ae701fc3c8b79 100644 (file)
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2005-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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';
@@ -123,7 +125,7 @@ if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'wlanap del interface'}" ){
 
 if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
        # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc
-       if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2")){
+       if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
                if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
                        $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
                }
@@ -232,17 +234,28 @@ END
        }
 }
 
+# Change old "n" to "gn"
+if ( $wlanapsettings{'HW_MODE'} eq 'n' ) {
+       $wlanapsettings{'HW_MODE'}='gn';
+}
+
 $checked{'HIDESSID'}{'off'} = '';
 $checked{'HIDESSID'}{'on'} = '';
 $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;
@@ -253,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){
@@ -350,7 +378,8 @@ print <<END
                <option value='a' $selected{'HW_MODE'}{'a'}>802.11a</option>
                <option value='b' $selected{'HW_MODE'}{'b'}>802.11b</option>
                <option value='g' $selected{'HW_MODE'}{'g'}>802.11g</option>
-               <option value='n' $selected{'HW_MODE'}{'n'}>802.11n</option>
+               <option value='an' $selected{'HW_MODE'}{'an'}>802.11an</option>
+               <option value='gn' $selected{'HW_MODE'}{'gn'}>802.11gn</option>
        </select>
 </td></tr>
 
@@ -359,6 +388,7 @@ print <<END
                <option value='none' $selected{'ENC'}{'none'}>$Lang::tr{'wlanap none'}</option>
                <option value='wpa1' $selected{'ENC'}{'wpa1'}>WPA1</option>
                <option value='wpa2' $selected{'ENC'}{'wpa2'}>WPA2</option>
+               <option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
        </select>
 </td></tr>
 <tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}:&nbsp;</td><td class='base' colspan='3'>
@@ -369,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'>
@@ -478,7 +518,16 @@ driver=$wlanapsettings{'DRIVER_HOSTAPD'}
 channel=$wlanapsettings{'CHANNEL'}
 END
 ;
- if ( $wlanapsettings{'HW_MODE'} eq 'n' ){
+ if ( $wlanapsettings{'HW_MODE'} eq 'an' ){
+       print CONFIGFILE <<END
+hw_mode=a
+ieee80211n=1
+wmm_enabled=1
+ht_capab=$wlanapsettings{'HTCAPS'}
+END
+;
+
+ }elsif ( $wlanapsettings{'HW_MODE'} eq 'gn' ){
        print CONFIGFILE <<END
 hw_mode=g
 ieee80211n=1
@@ -529,7 +578,7 @@ END
 wpa=1
 wpa_passphrase=$wlanapsettings{'PWD'}
 wpa_key_mgmt=WPA-PSK
-wpa_pairwise=CCMP TKIP
+wpa_pairwise=TKIP
 END
 ;
  }elsif ( $wlanapsettings{'ENC'} eq 'wpa2'){
@@ -539,7 +588,18 @@ END
 wpa=2
 wpa_passphrase=$wlanapsettings{'PWD'}
 wpa_key_mgmt=WPA-PSK
-wpa_pairwise=CCMP TKIP
+rsn_pairwise=CCMP
+END
+;
+ } elsif ( $wlanapsettings{'ENC'} eq 'wpa1+2'){
+       print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+#
+wpa=3
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK
+wpa_pairwise=TKIP
+rsn_pairwise=CCMP
 END
 ;
  }