use strict;
# enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require '/var/ipfire/lang.pl';
require '/var/ipfire/header.pl';
my $debug = 0;
-my $i = 0;
+my $status = '';
my $errormessage = '';
-my $status_started = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
-my $status_stopped = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+my $status_started = "<td align='center' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td></tr>";
+my $status_stopped = "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td></tr>";
# get rid of used only once warnings
my @onlyonce = ( $Header::colourgreen, $Header::colourred );
my %checked=();
my %color = ();
my %mainsettings = ();
+my %netsettings=();
+my %wlanapsettings=();
my $channel = '';
my $txpower = '';
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
-my %wlanapsettings=();
$wlanapsettings{'APMODE'} = 'on';
-$wlanapsettings{'BOOTSTART'} = 'on';
+$wlanapsettings{'INTERFACE'} = $netsettings{'BLUE_DEV'};
$wlanapsettings{'SSID'} = 'IPFire';
$wlanapsettings{'HIDESSID'} = 'off';
-$wlanapsettings{'ENC'} = 'wpa'; # none / wep / wpa / wep+wpa
-$wlanapsettings{'ANTENNA'} = 'both';
+$wlanapsettings{'ENC'} = 'wpa'; # none / wpa1 /wpa2
$wlanapsettings{'TXPOWER'} = 'auto';
-# $wlanapsettings{'CC'} = '276'; # CountryCode, 276 = Germany
-$wlanapsettings{'CHAN'} = '5';
-
-$wlanapsettings{'WEPKEY1'} = 'BF715772DADA8A3E7AFFA5C26B';
-$wlanapsettings{'WEPKEY2'} = '';
-$wlanapsettings{'WEPKEY3'} = '';
-$wlanapsettings{'WEPKEY4'} = '';
-$wlanapsettings{'USEDKEY'} = '1';
-
+$wlanapsettings{'CHAN'} = '05';
$wlanapsettings{'PWD'} = 'IPFire-2.x';
-$wlanapsettings{'PSK'} = '69eb868ed7b3cc36d767b729048c9c585234723d1eafbe66e5a16957b7c85e9c';
-$wlanapsettings{'WPA'} = '3';
-
$wlanapsettings{'SYSLOGLEVEL'} = '0';
$wlanapsettings{'DEBUG'} = '4';
-$wlanapsettings{'DRIVER'} = 'MADWIFI'; # UNKNOWN / MADWIFI / RT2500 / PRISM54 / ...
+$wlanapsettings{'DRIVER'} = 'MADWIFI';
-# WLANMODE= (a/b/g)
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-my %netsettings=();
-&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
-
my %cgiparams=();
$cgiparams{'ACTION'} = '';
-$cgiparams{'RUNNING'} = 'off';
$cgiparams{'APMODE'} = 'on';
-$cgiparams{'BOOTSTART'} = 'on';
$cgiparams{'SSID'} = 'IPFire';
$cgiparams{'HIDESSID'} = 'off';
$cgiparams{'ENC'} = 'wpa'; # none / wep / wpa / wep+wpa
-$cgiparams{'ANTENNA'} = 'both';
$cgiparams{'TXPOWER'} = 'auto';
-$cgiparams{'CHAN'} = '5';
-
-$cgiparams{'WEPKEY1'} = 'BF715772DADA8A3E7AFFA5C26B';
-$cgiparams{'WEPKEY2'} = '';
-$cgiparams{'WEPKEY3'} = '';
-$cgiparams{'WEPKEY4'} = '';
-$cgiparams{'USEDKEY'} = '1';
-$cgiparams{'WEPPWD'} = '';
-$cgiparams{'WEPKEYCALC'} = '';
-
+$cgiparams{'CHAN'} = '05';
$cgiparams{'PWD'} = 'IPFire-2.x';
-$cgiparams{'PSK'} = '69eb868ed7b3cc36d767b729048c9c585234723d1eafbe66e5a16957b7c85e9c';
-$cgiparams{'WPA'} = '3';
-
$cgiparams{'SYSLOGLEVEL'} = '0';
$cgiparams{'DEBUG'} = '4';
&Header::getcgihash(\%cgiparams);
&Header::showhttpheaders();
if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
- $wlanapsettings{'APMODE'} = $cgiparams{'APMODE'};
- $wlanapsettings{'BOOTSTART'} = $cgiparams{'BOOTSTART'};
$wlanapsettings{'SSID'} = $cgiparams{'SSID'};
$wlanapsettings{'HIDESSID'} = $cgiparams{'HIDESSID'};
$wlanapsettings{'ENC'} = $cgiparams{'ENC'};
- $wlanapsettings{'ANTENNA'} = $cgiparams{'ANTENNA'};
$wlanapsettings{'CHAN'} = $cgiparams{'CHAN'};
$wlanapsettings{'TXPOWER'} = $cgiparams{'TXPOWER'};
- $wlanapsettings{'WEPKEY1'} = $cgiparams{'WEPKEY1'};
- $wlanapsettings{'WEPKEY2'} = $cgiparams{'WEPKEY2'};
- $wlanapsettings{'WEPKEY3'} = $cgiparams{'WEPKEY3'};
- $wlanapsettings{'WEPKEY4'} = $cgiparams{'WEPKEY4'};
- $wlanapsettings{'USEDKEY'} = $cgiparams{'USEDKEY'};
-
$wlanapsettings{'PWD'} = $cgiparams{'PWD'};
- $wlanapsettings{'PSK'} = $cgiparams{'PSK'};
- $wlanapsettings{'WPA'} = $cgiparams{'WPA'};
$wlanapsettings{'SYSLOGLEVEL'}= $cgiparams{'SYSLOGLEVEL'};
$wlanapsettings{'DEBUG'} = $cgiparams{'DEBUG'};
- # verify WEP keys, allowed characters are 0..9A..F, length must be 10 or 26 characters
- for $i ( 1 .. 4 ){
- my $wepkey = $wlanapsettings{"WEPKEY${i}"};
- next if ( $wepkey eq '' );
- if ( (length($wepkey) != 10) && (length($wepkey) != 26) ){
- $errormessage .= "Invalid length in WEP Key $i. Key must be 10 or 26 characters.<br />";
- next;
- }
-
- if ( $wepkey !~ /[0-9A-Fa-f]$/ ){
- $errormessage .= "Invalid character in WEP Key $i. Only A..F and 0..9 allowed.<br />";
- next;
- }
-
- $wlanapsettings{"WEPKEY${i}"} = uc($wepkey);
- }
-
# verify WPA Passphrase, must be 8 .. 63 characters
if ( (length($wlanapsettings{'PWD'}) < 8) || (length($wlanapsettings{'PWD'}) > 63) ){
$errormessage .= "Invalid length in WPA Passphrase. Must be between 8 and 63 characters.<br />";
&WriteConfig();
&WriteConfig_hostapd();
- system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1") if ( $cgiparams{'RUNNING'} eq 'on' );
+ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1")
}
}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
}elsif ( $cgiparams{'ACTION'} eq 'Stop' ){
system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
-}elsif ( $cgiparams{'ACTION'} eq 'Calc WEP Key' ){
- $cgiparams{'WEPKEYCALC'} = '';
- $errormessage = "Invalid length in WEP Passphrase. Must be exactly 13 characters.<br />" if ( length($cgiparams{'WEPPWD'}) != 13 );
-
- if ( $errormessage eq '' ){
- $cgiparams{'WEPKEYCALC'} = uc(&WEPKeyCalc($cgiparams{'WEPPWD'}));
- }
-}elsif ( $cgiparams{'ACTION'} eq 'Random WEP Key' ){
- $cgiparams{'WEPKEYCALC'} = &WEPKeyRandom();
}
&Header::openpage('WLAN', 1, '', '');
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
if ( $errormessage ){
- &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+ &Header::openbox('100%', 'center', $Lang::tr{'error messages'});
print "<class name='base'>$errormessage\n";
print " </class>\n";
&Header::closebox();
###############
# DEBUG DEBUG
if ( $debug ){
- &Header::openbox('100%', 'left', 'DEBUG');
+ &Header::openbox('100%', 'center', 'DEBUG');
my $debugCount = 0;
foreach my $line (sort keys %cgiparams) {
print "$line = '$cgiparams{$line}'<br />\n";
#
my $wlan_card_status = 'dummy';
my $wlan_ap_status = '';
-my $wlan_hostapd_status = '';
my $blue_message = "";
if ( ($netsettings{'BLUE_DEV'} eq '') || ($netsettings{'BLUE_DRIVER'} eq '') ){
$cmd_out = `/usr/sbin/iwconfig $netsettings{'BLUE_DEV'} | /bin/grep "Mode:Master"`;
if ( $cmd_out ne '' ){
$wlan_ap_status = 'up';
- if ( -e "/var/run/hostapd.pid" ){
- $wlan_hostapd_status = 'up';
- }
}
}
}
}
-my $disabled_apmode = "disabled='disabled'";
-$disabled_apmode = '' if ( ($wlanapsettings{'DRIVER'} eq 'MADWIFI') || ($wlanapsettings{'DRIVER'} eq 'HOSTAP') || ($wlanapsettings{'DRIVER'} eq 'ACX100') );
-
-my $checked_apmode = '';
-my $checked_bootstart = '';
my $checked_hidessid = '';
-$checked_apmode = "checked='checked'" if ( $wlanapsettings{'APMODE'} eq 'on' );
-$checked_bootstart = "checked='checked'" if ( $wlanapsettings{'BOOTSTART'} eq 'on' );
$checked_hidessid = "checked='checked'" if ( $wlanapsettings{'HIDESSID'} eq 'on' );
$selected{'ENC'}{'none'} = '';
-$selected{'ENC'}{'wep'} = '';
-$selected{'ENC'}{'wpa'} = '';
-$selected{'ENC'}{'wep+wpa'} = '';
+$selected{'ENC'}{'wpa1'} = '';
+$selected{'ENC'}{'wpa2'} = '';
$selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
+$selected{'CHAN'}{$wlanapsettings{'CHAN'}} = "selected='selected'";
+$selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'";
-$selected{'ANTENNA'}{'both'} = '';
-$selected{'ANTENNA'}{'1'} = '';
-$selected{'ANTENNA'}{'2'} = '';
-$selected{'ANTENNA'}{$wlanapsettings{'ANTENNA'}} = "selected='selected'";
-
-my @channellist;
+my @channellist_cmd = `iwlist $netsettings{'BLUE_DEV'} channel`;
# get available channels
-if ( -e "/var/ipfire/wlanap/channels" ){
- open(CHANNELFILE, "/var/ipfire/wlanap/channels");
- @channellist=<CHANNELFILE>;
- close CHANNELFILE;
- foreach $channel (@channellist){
- chomp($channel);
- $selected{'CHAN'}{$channel} = '';
- }
- $selected{'CHAN'}{$wlanapsettings{'CHAN'}} = 'selected="selected"';
-}else{
- $channellist[0] = '1';
- $selected{'CHAN'}{'1'} = 'selected="selected"';
-}
-my @txpowerlist;
-# get available txpowers
-if ( -e "/var/ipfire/wlanap/txpower" ){
- open(CHANNELFILE, "/var/ipfire/wlanap/txpower");
- @txpowerlist=<CHANNELFILE>;
- close CHANNELFILE;
- foreach $txpower (@txpowerlist){
- chomp($txpower);
- $selected{'TXPOWER'}{$txpower} = '';
- }
- $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = 'selected="selected"';
-}else{
- $txpowerlist[0] = 'auto';
- $selected{'TXPOWER'}{'auto'} = 'selected="selected"';
+my @temp;
+foreach (@channellist_cmd){
+$_ =~ /(.*)Channel (\d+)(.*):/;
+$channel = $2;chomp $channel;
+if ( $channel =~ /\d+/ ){push(@temp,$channel);}
}
+my @channellist = @temp;
-$selected{'USEDKEY'}{'1'} = '';
-$selected{'USEDKEY'}{'2'} = '';
-$selected{'USEDKEY'}{'3'} = '';
-$selected{'USEDKEY'}{'4'} = '';
-$selected{'USEDKEY'}{$wlanapsettings{'USEDKEY'}} = "selected='selected'";
+my @txpower_cmd = `iwlist $netsettings{'BLUE_DEV'} txpower`;
+# get available channels
-$selected{'WPA'}{'1'} = '';
-$selected{'WPA'}{'2'} = '';
-$selected{'WPA'}{'3'} = '';
-$selected{'WPA'}{$wlanapsettings{'WPA'}} = "selected='selected'";
+my @temp;
+foreach (@txpower_cmd){
+$_ =~ /(\s)(\d+)(\s)dBm(\s)(.*)(\W)(\d+)(.*)/;
+$txpower = $7;chomp $txpower;
+if ( $txpower =~ /\d+/ ){push(@temp,$txpower."mW");}
+}
+my @txpower = @temp;
+push(@txpower,"auto");
$selected{'SYSLOGLEVEL'}{'0'} = '';
$selected{'SYSLOGLEVEL'}{'1'} = '';
#
# Status box
#
-&Header::openbox('100%', 'left', "WLAN Status");
+&Header::openbox('100%', 'center', "WLAN AP");
print <<END
-<table width='100%'>
+<table width='95%' cellspacing='0'>
+<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Services</b></td></tr>
END
;
if ( $wlan_card_status ne '' ){
- print "<tr><td class='base'><b>WLAN card ($wlanapsettings{'DRIVER'})</b></td>";
+ print "<tr><td class='base'>WLAN card ($wlanapsettings{'DRIVER'})</td>";
print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
- print "<td colspan='2'> </td></tr>";
- print "<tr><td class='base'><b>Access Point</b></td>";
+ print "<tr><td class='base'>Access Point</td>";
print $wlan_ap_status eq 'up' ? $status_started : $status_stopped;
- print "<td colspan='2'> </td></tr>";
- print "<tr><td class='base'><b>Hostapd</b></td>";
- print $wlan_hostapd_status eq 'up' ? $status_started : $status_stopped;
- print "<td colspan='2'> </td></tr>";
- print "<tr><td width='30%' align='right'> </td>";
- print "<td width='25' align='right'> </td>";
if ( $wlan_card_status eq 'up' ){
- print "<td width='40%' align='center'><input type='submit' name='ACTION' value='Stop' /><input type='hidden' name='RUNNING' value='on' /></td>";
+ print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Stop' /><input type='hidden' name='RUNNING' value='on' /></td></tr>";
}else{
- print "<td width='40%' align='center'><input type='submit' name='ACTION' value='Start' /></td>";
+ print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Start' /></td></tr>";
}
- print "<td width='5%' align='right'> </td>";
- print "</tr>";
}else{
- print "<tr><td width='55%' class='base'><b>$blue_message</b></td><td width='40%' align='center'> ";
- if ( $netsettings{'CONFIG_TYPE'} & 0x04 ){
- print "<input type='submit' name='ACTION' value='Detect' />"
- }else{
- print "</td><td> </td></tr><tr><td class='base' colspan='2'><b>Use setup on IPCop Console first to configure a (dummy) BLUE interface.</b>"
- }
- print " </td><td width='5%' align='right'> </td></tr>";
+ print "<tr><td colspan='2' class='base'><b>$blue_message</b></td></tr>";
}
-print <<END
-</table><hr />
-END
-;
-&Header::closebox();
+print "</table>";
if ( $wlan_card_status eq '' ){
print "</form>";
&Header::closepage();
exit 0;
}
-
-#
-# WLAN settings
-#
-&Header::openbox('100%', 'left', "WLAN Settings");
print <<END
-<table width='100%'>
-<tr><td width='25%' class='base'>Access Point: </td><td class='base' colspan='3'><input type='checkbox' name='APMODE' $checked_apmode $disabled_apmode /></td></tr>
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td bgcolor='$color{'color20'}' colspan='4' align='left'><b>WLAN Settings</b>
<tr><td width='25%' class='base'>SSID: </td><td class='base' colspan='3'><input type='text' name='SSID' size='40' value='$wlanapsettings{'SSID'}' /></td></tr>
-<tr><td width='25%' class='base'>Autostart after Boot: </td><td class='base' colspan='3'><input type='checkbox' name='BOOTSTART' $checked_bootstart /></td></tr>
-<tr><td width='25%' class='base'>Disable SSID broadcast: </td><td class='base' colspan='3'><input type='checkbox' name='HIDESSID' $checked_hidessid $disabled_apmode /></td></tr>
+<tr><td width='25%' class='base'>Disable SSID broadcast: </td><td class='base' colspan='3'><input type='checkbox' name='HIDESSID' $checked_hidessid /></td></tr>
<tr><td width='25%' class='base'>Encryption: </td><td class='base' colspan='3'>
<select name='ENC'>
<option value='none' $selected{'ENC'}{'none'}>none</option>
- <option value='wep' $selected{'ENC'}{'wep'}>wep</option>
- <option value='wpa' $selected{'ENC'}{'wpa'}>wpa</option>
- <option value='wep+wpa' $selected{'ENC'}{'wep+wpa'}>wep+wpa</option>
+ <option value='wpa1' $selected{'ENC'}{'wpa1'}>wpa1</option>
+ <option value='wpa2' $selected{'ENC'}{'wpa2'}>wpa2</option>
</select>
</td></tr>
-<tr><td width='25%' class='base'>Use Antenna: </td><td class='base' colspan='3'>
- <select name='ANTENNA'>
- <option value='both' $selected{'ANTENNA'}{'both'}>both</option>
- <option value='1' $selected{'ANTENNA'}{'1'}>1 only</option>
- <option value='2' $selected{'ANTENNA'}{'2'}>2 only</option>
- </select>
-</td></tr>
-<!-- <tr><td width='25%' class='base'>Select Country: </td><td class='base' colspan='3'><input type='checkbox' name='CC' $checked_hidessid /></td></tr> -->
<tr><td width='25%' class='base'>Channel: </td><td class='base' colspan='3'>
<select name='CHAN'>
END
foreach $channel (@channellist){
print "<option $selected{'CHAN'}{$channel}>$channel</option>";
}
+
print <<END
</select></td></tr>
<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'><select name='TXPOWER'>
END
;
-foreach $txpower (@txpowerlist){
+foreach $txpower (@txpower){
print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm";
}
print <<END
</select></td></tr>
-</table>
-<hr /><table width='100%'>
-<tr>
-<td width='55%' class='base' valign='top'> </td>
-<td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
-
-#
-# WEP
-#
-&Header::openbox('100%', 'left', "WEP Configuration");
-print <<END
-<table width='100%'>
-<tr><td width='25%' class='base'>Key 1: </td><td class='base' colspan='3'><input type='text' name='WEPKEY1' size='32' value='$wlanapsettings{'WEPKEY1'}' /></td></tr>
-<tr><td width='25%' class='base'>Key 2: <img src='/blob.gif' alt='*' /> </td><td class='base' colspan='3'><input type='text' name='WEPKEY2' size='32' value='$wlanapsettings{'WEPKEY2'}' /></td></tr>
-<tr><td width='25%' class='base'>Key 3: <img src='/blob.gif' alt='*' /> </td><td class='base' colspan='3'><input type='text' name='WEPKEY3' size='32' value='$wlanapsettings{'WEPKEY3'}' /></td></tr>
-<tr><td width='25%' class='base'>Key 4: <img src='/blob.gif' alt='*' /> </td><td class='base' colspan='3'><input type='text' name='WEPKEY4' size='32' value='$wlanapsettings{'WEPKEY4'}' /></td></tr>
-<tr><td width='25%' class='base'>WEP Key to Use: </td><td class='base' colspan='3'>
- <select name='USEDKEY'>
- <option value='1' $selected{'USEDKEY'}{'1'}>1</option>
- <option value='2' $selected{'USEDKEY'}{'2'}>2</option>
- <option value='3' $selected{'USEDKEY'}{'3'}>3</option>
- <option value='4' $selected{'USEDKEY'}{'4'}>4</option>
- </select>
-</td></tr>
-</table>
-<hr /><table width='100%'>
-<tr><td width='25%' class='base'>Passphrase: </td><td class='base' width='50%'><input type='text' name='WEPPWD' size='13' value='$cgiparams{'WEPPWD'}' /></td><td width='25%'><input type='submit' name='ACTION' value='Calc WEP Key' /></td></tr>
-<tr><td width='25%' class='base'>WEP Key: </td><td class='base'><input type='text' name='WEPKEYCALC' size='32' value='$cgiparams{'WEPKEYCALC'}' /></td><td width='25%'><input type='submit' name='ACTION' value='Random WEP Key' /></td></tr>
-</table>
-<hr /><table width='100%'>
-<tr>
-<td width='55%' class='base' valign='top'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
-<td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
-
-#
-# WPA
-#
-&Header::openbox('100%', 'left', "WPA Configuration");
-print <<END
-<table width='100%'>
<tr><td width='25%' class='base'>Passphrase: </td><td class='base' colspan='3'><input type='text' name='PWD' size='63' value='$wlanapsettings{'PWD'}' /></td></tr>
-<tr><td width='25%' class='base'>WPA Version: </td><td class='base' colspan='3'>
- <select name='WPA'>
- <option value='1' $selected{'WPA'}{'1'}>1</option>
- <option value='2' $selected{'WPA'}{'2'}>2</option>
- <option value='3' $selected{'WPA'}{'3'}>1+2</option>
- </select>
-</td></tr>
<tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'>
<select name='SYSLOGLEVEL'>
<option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 (verbose)</option>
</td>
<td width='25%' class='base'>Debuglevel (hostapd): </td><td class='base' width='25%'>
<select name='DEBUG'>
- <option value='0' $selected{'DEBUG'}{'0'}>0 (no debugging)</option>
- <option value='1' $selected{'DEBUG'}{'1'}>1 (minimal)</option>
- <option value='2' $selected{'DEBUG'}{'2'}>2 (verbose)</option>
- <option value='3' $selected{'DEBUG'}{'3'}>3 (msg dumps)</option>
- <option value='4' $selected{'DEBUG'}{'4'}>4 (excessive)</option>
+ <option value='0' $selected{'DEBUG'}{'0'}>0 (verbose)</option>
+ <option value='1' $selected{'DEBUG'}{'1'}>1 (debugging)</option>
+ <option value='2' $selected{'DEBUG'}{'2'}>2 (informations)</option>
+ <option value='3' $selected{'DEBUG'}{'3'}>3 (notifications)</option>
+ <option value='4' $selected{'DEBUG'}{'4'}>4 (warnings)</option>
</select>
</td></tr>
</table>
-<hr /><table width='100%'>
-<tr>
-<td width='55%' class='base' valign='top'> </td>
-<td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+<br />
+<table width='10%' cellspacing='0'>
+<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
+ <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
</tr>
</table>
END
;
-&Header::closebox();
+if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
+ $status = `cat /proc/net/madwifi/$netsettings{'BLUE_DEV'}/associated_sta`;
+}
+print <<END
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td bgcolor='$color{'color20'}' colspan='2' align='left'><b>WLAN Status</b></td></tr>
+<tr><td><pre>@channellist_cmd</pre></td><td><pre>@txpower_cmd</pre></td></tr>
+<tr><td colspan='2'><pre>Connected Stations<br />$status</pre></td></tr>
+</table>
+END
+;
+&Header::closebox();
print "</form>";
&Header::closebigbox();
&Header::closepage();
-sub WEPKeyRandom{
- my $length = 26; # 10 is also allowed
- my $string = "0123456789ABCDEF";
- my @chars = split(//,$string);
- my $n = @chars;
- my $index;
- my $key = '';
- for ( $i = 0; $i < $length; $i++){
- $index = int(rand $n);
- $key = $key . $chars[$index];
- }
- return $key;
-}
-
-sub WEPKeyCalc{
- require Digest::MD5;
- return substr Digest::MD5::md5_hex( substr( shift() x 64, 0, 64 ) ), 0, 26;
-}
-
sub WriteConfig{
&General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
}
open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
print CONFIGFILE <<END
-##### hostapd configuration file ##############################################
+######################### basic hostapd configuration ##########################
interface=$netsettings{'BLUE_DEV'}
-# Driver interface type (hostap/wired/madwifi; default: hostap)
driver=$wlanapsettings{'DRIVER_HOSTAPD'}
logger_syslog=-1
logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
logger_stdout=-1
-logger_stdout_level=$wlanapsettings{'SYSLOGLEVEL'}
-debug=$wlanapsettings{'DEBUG'}
+logger_stdout_level=$wlanapsettings{'DEBUG'}
dump_file=/tmp/hostapd.dump
-ssid=$wlanapsettings{'SSID'}
+ignore_broadcast_ssid=0
eapol_key_index_workaround=0
eap_server=0
own_ip_addr=127.0.0.1
-wpa=$wlanapsettings{'WPA'}
-wpa_passphrase=$wlanapsettings{'PWD'}
-wpa_key_mgmt=WPA-PSK
-wpa_pairwise=CCMP TKIP
auth_algs=3
ctrl_interface=/var/run/hostapd
ctrl_interface_group=0
macaddr_acl=0
END
;
+ if ( $wlanapsettings{'HIDESSID'} eq 'on' ){
+ print CONFIGFILE <<END
+ssid=$wlanapsettings{'SSID'}
+ignore_broadcast_ssid=2
+END
+;
+
+ }else{
+ print CONFIGFILE <<END
+ssid=$wlanapsettings{'SSID'}
+ignore_broadcast_ssid=0
+END
+;
+
+ }
+
+ if ( $wlanapsettings{'ENC'} eq 'wpa1'){
+ print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+
+wpa=1
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK WPA-EAP
+wpa_pairwise=CCMP TKIP
+END
+;
+ }elsif ( $wlanapsettings{'ENC'} eq 'wpa2'){
+ print CONFIGFILE <<END
+######################### wpa hostapd configuration ############################
+
+wpa=2
+wpa_passphrase=$wlanapsettings{'PWD'}
+wpa_key_mgmt=WPA-PSK WPA-EAP
+wpa_pairwise=CCMP TKIP
+END
+;
+ }
close CONFIGFILE;
}
projects / ipfire-2.x.git / blobdiff