###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2005-2012 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2005-2013 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 #
}
if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
- # verify WPA Passphrase, must be 8 .. 63 characters - only wiht enabled enc
+ # verify WPA Passphrase - only with enabled enc
if (($wlanapsettings{'ENC'} eq "wpa1") || ($wlanapsettings{'ENC'} eq "wpa2") || ($wlanapsettings{'ENC'} eq "wpa1+2")){
+ # must be 8 .. 63 characters
if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63)){
$errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
}
+ # only ASCII alowed
+ if ( !($wlanapsettings{'PWD'} !~ /[^\x00-\x7f]/) ){
+ $errormessage .= "$Lang::tr{'wlanap invalid wpa'}<br />";
+ }
}
if ( $errormessage eq '' ){
$selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'";
my $monwlaninterface = $wlanapsettings{'INTERFACE'};
-if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+if ( -d '/sys/class/net/mon.'.$wlanapsettings{'INTERFACE'} ) {
$monwlaninterface = 'mon.'.$wlanapsettings{'INTERFACE'};
}
<option value='wpa1+2' $selected{'ENC'}{'wpa1+2'}>WPA1+2</option>
</select>
</td></tr>
+END
+;
+
+if ( scalar @channellist > 0 ){
+ print <<END
<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}: </td><td class='base' colspan='3'>
<select name='CHANNEL'>
END
;
-foreach $channel (@channellist){
- print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+ foreach $channel (@channellist){
+ print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
+ }
+ print "</select></td></tr>"
+} else {
+ print <<END
+<tr><td width='25%' class='base'>$Lang::tr{'wlanap channel'}: </td><td class='base' colspan='3'>
+<input type='text' name='CHANNEL' size='10' value='$wlanapsettings{'CHANNEL'}' />
+</td></tr>
+END
+;
}
print <<END
-</select></td></tr>
<tr><td width='25%' class='base'>$Lang::tr{'wlanap country'}: </td><td class='base' colspan='3'>
<select name='COUNTRY'>
END
open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
print CONFIGFILE <<END
+driver=$wlanapsettings{'DRIVER_HOSTAPD'}
######################### basic hostapd configuration ##########################
#
interface=$wlanapsettings{'INTERFACE'}
-driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+country_code=$wlanapsettings{'COUNTRY'}
+ieee80211d=1
channel=$wlanapsettings{'CHANNEL'}
END
;