&General::readhash("/var/ipfire/ethernet/settings", \%netsettings);
$wlanapsettings{'APMODE'} = 'on';
+$wlanapsettings{'ACTION'} = '';
$wlanapsettings{'MACMODE'} = '0';
$wlanapsettings{'INTERFACE'} = '';
$wlanapsettings{'SSID'} = 'IPFire';
$wlanapsettings{'ENC'} = 'wpa2'; # none / wpa1 /wpa2
$wlanapsettings{'TXPOWER'} = 'auto';
$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{'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{'MACS'} = $cgiparams{'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 ( $cgiparams{'ACTION'} eq 'Restart' ){
+}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";
$selected{'ENC'}{$wlanapsettings{'ENC'}} = "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 $wlanapsettings{'INTERFACE'} channel`;
}
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'>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>
+ </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>
if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
$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'>
#
interface=$wlanapsettings{'INTERFACE'}
driver=$wlanapsettings{'DRIVER_HOSTAPD'}
+channel=$wlanapsettings{'CHANNEL'}
+hw_mode=$wlanapsettings{'HW_MODE'}
logger_syslog=-1
logger_syslog_level=$wlanapsettings{'SYSLOGLEVEL'}
logger_stdout=-1
logger_stdout_level=$wlanapsettings{'DEBUG'}
dump_file=/tmp/hostapd.dump
-auth_algs=3
+auth_algs=1
ctrl_interface=/var/run/hostapd
ctrl_interface_group=0
END
}
close CONFIGFILE;
-$wlanapsettings{'MACS'} =~ s/\r//gi;
-chomp($wlanapsettings{'MACS'});
open (MACFILE, ">/var/ipfire/wlanap/macfile");
- print MACFILE <<END
-$wlanapsettings{'MACS'}
-END
-;
+ foreach(@macs){
+ $_ =~ s/\r//gi;
+ chomp($_);
+ if ( $_ ne "" ){print MACFILE $_;}
+ }
close MACFILE;
}