###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# 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 #
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';
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
$wlanapsettings{'APMODE'} = 'on';
+$wlanapsettings{'ACTION'} = '';
$wlanapsettings{'MACMODE'} = '0';
$wlanapsettings{'INTERFACE'} = '';
$wlanapsettings{'SSID'} = 'IPFire';
$wlanapsettings{'DRIVER'} = 'MADWIFI';
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+&Header::getcgihash(\%wlanapsettings);
-my %cgiparams=();
-$cgiparams{'ACTION'} = '';
-$cgiparams{'APMODE'} = 'on';
-$cgiparams{'MACMODE'} = '0';
-$cgiparams{'SSID'} = 'IPFire';
-$cgiparams{'HIDESSID'} = 'off';
-$cgiparams{'ENC'} = 'wpa2'; # none / wep / wpa / wep+wpa
-$cgiparams{'TXPOWER'} = 'auto';
-$cgiparams{'CHANNEL'} = '05';
-$cgiparams{'PWD'} = 'IPFire-2.x';
-$cgiparams{'SYSLOGLEVEL'} = '0';
-$cgiparams{'DEBUG'} = '4';
-&Header::getcgihash(\%cgiparams);
+my @macs = $wlanapsettings{'MACS'};
+delete $wlanapsettings{'__CGI__'};
+delete $wlanapsettings{'x'};
+delete $wlanapsettings{'y'};
+delete $wlanapsettings{'MACS'};
+delete $wlanapsettings{'ACCEPT_MACS'};
+delete $wlanapsettings{'DENY_MACS'};
&Header::showhttpheaders();
-if ( $cgiparams{'ACTION'} eq "$Lang::tr{'save'}" ){
- $wlanapsettings{'SSID'} = $cgiparams{'SSID'};
- $wlanapsettings{'MACMODE'} = $cgiparams{'MACMODE'};
- $wlanapsettings{'ACCEPT_MACS'}= $cgiparams{'ACCEPT_MACS'};
- $wlanapsettings{'DENY_MACS'} = $cgiparams{'DENY_MACS'};
- $wlanapsettings{'HIDESSID'} = $cgiparams{'HIDESSID'};
- $wlanapsettings{'ENC'} = $cgiparams{'ENC'};
- $wlanapsettings{'CHANNEL'} = $cgiparams{'CHANNEL'};
- $wlanapsettings{'TXPOWER'} = $cgiparams{'TXPOWER'};
-
- $wlanapsettings{'PWD'} = $cgiparams{'PWD'};
- $wlanapsettings{'SYSLOGLEVEL'}= $cgiparams{'SYSLOGLEVEL'};
- $wlanapsettings{'DEBUG'} = $cgiparams{'DEBUG'};
-
+if ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'save'}" ){
# 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 />";
system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
-}elsif ( $cgiparams{'ACTION'} eq "$Lang::tr{'interface'}" ){
- $wlanapsettings{'INTERFACE'} = $cgiparams{'INTERFACE'};
+}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){
&General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
+}elsif ( $wlanapsettings{'ACTION'} eq 'Start' ){
system("/usr/local/bin/wlanapctrl start >/dev/null 2>&1");
-}elsif ( $cgiparams{'ACTION'} eq 'Stop' ){
+}elsif ( $wlanapsettings{'ACTION'} eq 'Stop' ){
system("/usr/local/bin/wlanapctrl stop >/dev/null 2>&1");
+}elsif ( $wlanapsettings{'ACTION'} eq 'Restart' ){
+ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
&Header::openpage('WLAN', 1, '', '');
&Header::openbigbox('100%', 'left', '', $errormessage);
-print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
if ( $errormessage ){
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
if ( $debug ){
&Header::openbox('100%', 'center', 'DEBUG');
my $debugCount = 0;
- foreach my $line (sort keys %cgiparams) {
- print "$line = '$cgiparams{$line}'<br />\n";
+ foreach my $line (sort keys %wlanapsettings) {
+ print "$line = '$wlanapsettings{$line}'<br />\n";
$debugCount++;
}
print " Count: $debugCount\n";
print $wlan_card_status eq 'up' ? $status_started : $status_stopped;
print "<tr><td class='base'>Access Point</td>";
print $wlan_ap_status eq 'up' ? $status_started : $status_stopped;
- if ( $wlan_card_status eq 'up' ){
- print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Stop' />";
- print "<input type='submit' name='ACTION' value='Restart' /></td></tr>";
- }else{
- print "<tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='Start' /></td></tr>";
- }
}else{
print "<tr><td colspan='2' class='base'><b>$message</b></td></tr>";
}
print "</table>";
+print <<END
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td align='left' width='40%' />
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Start' /><input type='image' alt='Start' title='Start' src='/images/go-up.png' /></form></td>
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Stop' /><input type='image' alt='Stop' title='Stop' src='/images/go-down.png' /></form></td>
+<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='Restart' /><input type='image' alt='Restart' title='Restart' src='/images/view-refresh.png' /></form></td></tr>
+</table>
+END
+;
+
if ( $wlan_card_status eq '' ){
&Header::closebox();
&Header::closebigbox();
}
print <<END
<br />
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<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>
<td width='25%' class='base'>Mac Filter: </td><td class='base' width='25%'>
<select name='MACMODE'>
<option value='0' $selected{'MACMODE'}{'0'}>0 (off)</option>
- <option value='1' $selected{'MACMODE'}{'1'}>1 (Deny list)</option>
- <option value='2' $selected{'MACMODE'}{'2'}>2 (Accept list)</option>
+ <option value='1' $selected{'MACMODE'}{'1'}>1 (Accept MACs)</option>
+ <option value='2' $selected{'MACMODE'}{'2'}>2 (Deny MACs)</option>
</select>
-</td><td colspan='2'></td></tr>
-<tr>
- <td colspan='2' class='base'>Mac Accept List (one per line)</td>
- <td colspan='2' class='base'>Mac Deny List (one per line)</td>
-</tr>
-<tr>
- <td colspan='2'><textarea name='ACCEPT_MACS' cols='32' rows='3' wrap='off'>
+</td><td colspan='2'>Mac Adress List (one per line)<br /><textarea name='MACS' cols='20' rows='5' wrap='off'>
END
;
- print `cat /var/ipfire/wlanap/hostapd.accept`;
+ print `cat /var/ipfire/wlanap/macfile`;
print <<END
</textarea></td>
- <td colspan='2'><textarea name='DENY_MACS' cols='32' rows='3' wrap='off'>
-END
-;
- print `cat /var/ipfire/wlanap/hostapd.deny`;
- print <<END
-</textarea></td>
-</tr>
</table>
END
;
END
;
}
- print CONFIGFILE <<END
-########################### mac acl configuration ##############################
-macaddr_acl=$wlanapsettings{'MACMODE'}
-accept_mac_file=/etc/hostapd.accept
-deny_mac_file=/etc/hostapd.deny
-END
-;
close CONFIGFILE;
- open (MACFILE, ">/var/ipfire/wlanap/hostapd.accept");
- print MACFILE <<END
-$wlanapsettings{'ACCEPT_MACS'}
-END
-;
- close MACFILE;
-
- open (MACFILE, ">/var/ipfire/wlanap/hostapd.deny");
- print MACFILE <<END
-$wlanapsettings{'DENY_MACS'}
-END
-;
+ open (MACFILE, ">/var/ipfire/wlanap/macfile");
+ foreach(@macs){
+ $_ =~ s/\r//gi;
+ chomp($_);
+ if ( $_ ne "" ){print MACFILE $_;}
+ }
close MACFILE;
}