###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 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 #
&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
$wlanapsettings{'APMODE'} = 'on';
-$wlanapsettings{'INTERFACE'} = $netsettings{'BLUE_DEV'};
+$wlanapsettings{'ACTION'} = '';
+$wlanapsettings{'MACMODE'} = '0';
+$wlanapsettings{'INTERFACE'} = '';
$wlanapsettings{'SSID'} = 'IPFire';
$wlanapsettings{'HIDESSID'} = 'off';
-$wlanapsettings{'ENC'} = 'wpa'; # none / wpa1 /wpa2
+$wlanapsettings{'ENC'} = 'wpa2'; # none / wpa1 /wpa2
$wlanapsettings{'TXPOWER'} = 'auto';
-$wlanapsettings{'CHAN'} = '05';
+$wlanapsettings{'CHANNEL'} = '05';
+$wlanapsettings{'HW_MODE'} = 'g';
$wlanapsettings{'PWD'} = 'IPFire-2.x';
$wlanapsettings{'SYSLOGLEVEL'} = '0';
$wlanapsettings{'DEBUG'} = '4';
$wlanapsettings{'DRIVER'} = 'MADWIFI';
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+&Header::getcgihash(\%wlanapsettings);
-my %cgiparams=();
-$cgiparams{'ACTION'} = '';
-$cgiparams{'APMODE'} = 'on';
-$cgiparams{'SSID'} = 'IPFire';
-$cgiparams{'HIDESSID'} = 'off';
-$cgiparams{'ENC'} = 'wpa'; # none / wep / wpa / wep+wpa
-$cgiparams{'TXPOWER'} = 'auto';
-$cgiparams{'CHAN'} = '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{'HIDESSID'} = $cgiparams{'HIDESSID'};
- $wlanapsettings{'ENC'} = $cgiparams{'ENC'};
- $wlanapsettings{'CHAN'} = $cgiparams{'CHAN'};
- $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 />";
}
if ( $errormessage eq '' ){
- &WriteConfig();
+ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
&WriteConfig_hostapd();
- system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1")
+ system("/usr/local/bin/wlanapctrl restart >/dev/null 2>&1");
}
-}elsif ( $cgiparams{'ACTION'} eq 'Start' ){
+}elsif ( $wlanapsettings{'ACTION'} eq "$Lang::tr{'interface'}" ){
+ &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
+}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";
#
my $wlan_card_status = 'dummy';
my $wlan_ap_status = '';
-my $blue_message = "";
+my $message = "";
-if ( ($netsettings{'BLUE_DEV'} eq '') || ($netsettings{'BLUE_DRIVER'} eq '') ){
- $blue_message = "No BLUE Interface.";
+$selected{'INTERFACE'}{'green0'} = '';
+$selected{'INTERFACE'}{'blue0'} = '';
+$selected{'ENC'}{$wlanapsettings{'INTERFACE'}} = "selected='selected'";
+
+if ( ($wlanapsettings{'INTERFACE'} eq '') ){
+ $message = "No WLan Interface selected.";
+ &Header::openbox('100%', 'center', "WLAN AP");
+print <<END
+$message<br />
+<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+<select name='INTERFACE'>
+ <option value='green0' $selected{'INTERFACE'}{'green0'}>green0</option>
+END
+;
+ if ( $netsettings{'BLUE_DEV'} ne ''){
+ print "<option value='blue0' $selected{'INTERFACE'}{'blue0'}>blue0</option>";
+ }
+print <<END
+</select>
+<br />
+ <input type='hidden' name='ACTION' value='$Lang::tr{'interface'}' />
+ <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form>
+END
+;
+ &Header::closebox();
+ &Header::closebigbox();
+ &Header::closepage();
+ exit;
}else{
- my $cmd_out = `/usr/sbin/iwconfig $netsettings{'BLUE_DEV'} 2>/dev/null`;
+ my $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} 2>/dev/null`;
if ( $cmd_out eq '' ){
- $blue_message = "BLUE Interface is not a WLAN card.";
+ $message = "Interface is not a WLAN card.";
+ $wlan_card_status = '';
}else{
- $cmd_out = `/sbin/ifconfig | /bin/grep $netsettings{'BLUE_DEV'}`;
+ $cmd_out = `/sbin/ifconfig | /bin/grep $wlanapsettings{'INTERFACE'}`;
if ( $cmd_out eq '' ){
$wlan_card_status = 'down';
}else{
$wlan_card_status = 'up';
- $cmd_out = `/usr/sbin/iwconfig $netsettings{'BLUE_DEV'} | /bin/grep "Mode:Master"`;
+ $cmd_out = `/usr/sbin/iwconfig $wlanapsettings{'INTERFACE'} | /bin/grep "Mode:Master"`;
if ( $cmd_out ne '' ){
$wlan_ap_status = 'up';
}
}
}
-my $checked_hidessid = '';
-$checked_hidessid = "checked='checked'" if ( $wlanapsettings{'HIDESSID'} eq 'on' );
+$checked{'HIDESSID'}{'off'} = '';
+$checked{'HIDESSID'}{'on'} = '';
+$checked{'HIDESSID'}{$wlanapsettings{'HIDESSID'}} = "checked='checked'";
-$selected{'ENC'}{'none'} = '';
-$selected{'ENC'}{'wpa1'} = '';
-$selected{'ENC'}{'wpa2'} = '';
$selected{'ENC'}{$wlanapsettings{'ENC'}} = "selected='selected'";
-$selected{'CHAN'}{$wlanapsettings{'CHAN'}} = "selected='selected'";
+$selected{'CHANNEL'}{$wlanapsettings{'CHANNEL'}} = "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 $netsettings{'BLUE_DEV'} channel`;
+my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel`;
# get available channels
my @temp;
}
my @channellist = @temp;
-my @txpower_cmd = `iwlist $netsettings{'BLUE_DEV'} txpower`;
+my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower`;
# get available channels
my @temp;
my @txpower = @temp;
push(@txpower,"auto");
-$selected{'SYSLOGLEVEL'}{'0'} = '';
-$selected{'SYSLOGLEVEL'}{'1'} = '';
-$selected{'SYSLOGLEVEL'}{'2'} = '';
-$selected{'SYSLOGLEVEL'}{'3'} = '';
-$selected{'SYSLOGLEVEL'}{'4'} = '';
$selected{'SYSLOGLEVEL'}{$wlanapsettings{'SYSLOGLEVEL'}} = "selected='selected'";
-
-$selected{'DEBUG'}{'0'} = '';
-$selected{'DEBUG'}{'1'} = '';
-$selected{'DEBUG'}{'2'} = '';
-$selected{'DEBUG'}{'3'} = '';
-$selected{'DEBUG'}{'4'} = '';
$selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
#
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' /><input type='hidden' name='RUNNING' value='on' /></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>$blue_message</b></td></tr>";
+ 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 '' ){
- print "</form>";
+ &Header::closebox();
&Header::closebigbox();
&Header::closepage();
exit 0;
}
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>
-<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'>Disable SSID broadcast: </td><td class='base' colspan='3'>on <input type='radio' name='HIDESSID' value='on' $checked{'HIDESSID'}{'on'} />/
+ <input type='radio' name='HIDESSID' value='off' $checked{'HIDESSID'}{'off'} /> off</td></tr>
+<tr><td width='25%' class='base'>HW Mode: </td><td class='base' colspan='3'>
+ <select name='HW_MODE'>
+ <option value='a' $selected{'HW_MODE'}{'a'}>a</option>
+ <option value='b' $selected{'HW_MODE'}{'b'}>b</option>
+ <option value='g' $selected{'HW_MODE'}{'g'}>g</option>
+ <option value='n' $selected{'HW_MODE'}{'n'}>n</option>
+ </select>
+</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>
</select>
</td></tr>
<tr><td width='25%' class='base'>Channel: </td><td class='base' colspan='3'>
- <select name='CHAN'>
+ <select name='CHANNEL'>
END
;
foreach $channel (@channellist){
- print "<option $selected{'CHAN'}{$channel}>$channel</option>";
+ print "<option $selected{'CHANNEL'}{$channel}>$channel</option>";
}
print <<END
</select>
</td></tr>
</table>
+END
+;
+if ( $wlanapsettings{'INTERFACE'} =~ /green0/ ){
+ print <<END
+<br />
+<table width='95%' cellspacing='0'>
+<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 (Accept MACs)</option>
+ <option value='2' $selected{'MACMODE'}{'2'}>2 (Deny MACs)</option>
+ </select>
+</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/macfile`;
+print <<END
+</textarea></td>
+</table>
+END
+;
+}
+print <<END
<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>
+ <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
;
if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
- $status = `cat /proc/net/madwifi/$netsettings{'BLUE_DEV'}/associated_sta`;
+ $status = `wlanconfig $wlanapsettings{'INTERFACE'} list`;
+}
+if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
+ $status = `iw dev $wlanapsettings{'INTERFACE'} station dump`;
}
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>
+<tr><td colspan='2'><pre>$status</pre></td></tr>
</table>
END
;
&Header::closebigbox();
&Header::closepage();
-sub WriteConfig{
- &General::writehash("/var/ipfire/wlanap/settings", \%wlanapsettings);
-}
-
sub WriteConfig_hostapd{
$wlanapsettings{'DRIVER_HOSTAPD'} = lc($wlanapsettings{'DRIVER'});
open (CONFIGFILE, ">/var/ipfire/wlanap/hostapd.conf");
print CONFIGFILE <<END
######################### basic hostapd configuration ##########################
-
-interface=$netsettings{'BLUE_DEV'}
+#
+interface=$wlanapsettings{'INTERFACE'}
driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+channel=$wlanapsettings{'CHANNEL'}
+END
+;
+ if ( $wlanapsettings{'HW_MODE'} eq 'n' ){
+ print CONFIGFILE <<END
+hw_mode=g
+ieee80211n=1
+END
+;
+
+ }else{
+ print CONFIGFILE <<END
+hw_mode=$wlanapsettings{'HW_MODE'}
+END
+;
+
+ }
+
+print CONFIGFILE <<END
logger_syslog=-1
logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
logger_stdout=-1
logger_stdout_level=$wlanapsettings{'DEBUG'}
dump_file=/tmp/hostapd.dump
-eapol_key_index_workaround=0
-eap_server=0
-own_ip_addr=127.0.0.1
-auth_algs=3
+auth_algs=1
ctrl_interface=/var/run/hostapd
ctrl_interface_group=0
-macaddr_acl=0
END
;
if ( $wlanapsettings{'HIDESSID'} eq 'on' ){
;
}
-
+
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_key_mgmt=WPA-PSK
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_key_mgmt=WPA-PSK
wpa_pairwise=CCMP TKIP
END
;
}
close CONFIGFILE;
+
+ open (MACFILE, ">/var/ipfire/wlanap/macfile");
+ foreach(@macs){
+ $_ =~ s/\r//gi;
+ chomp($_);
+ if ( $_ ne "" ){print MACFILE $_;}
+ }
+ close MACFILE;
}
projects / people / pmueller / ipfire-2.x.git / blobdiff