mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
wlansp.cgi: remove MADWIFI functions.
This commit is contained in:
@@ -71,7 +71,7 @@ $wlanapsettings{'HW_MODE'} = 'g';
|
|||||||
$wlanapsettings{'PWD'} = 'IPFire-2.x';
|
$wlanapsettings{'PWD'} = 'IPFire-2.x';
|
||||||
$wlanapsettings{'SYSLOGLEVEL'} = '0';
|
$wlanapsettings{'SYSLOGLEVEL'} = '0';
|
||||||
$wlanapsettings{'DEBUG'} = '4';
|
$wlanapsettings{'DEBUG'} = '4';
|
||||||
$wlanapsettings{'DRIVER'} = 'MADWIFI';
|
$wlanapsettings{'DRIVER'} = 'NL80211';
|
||||||
$wlanapsettings{'HTCAPS'} = '';
|
$wlanapsettings{'HTCAPS'} = '';
|
||||||
|
|
||||||
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
|
&General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
|
||||||
@@ -306,15 +306,6 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
|
|||||||
}
|
}
|
||||||
# get available power
|
# get available power
|
||||||
|
|
||||||
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'}{$wlanapsettings{'SYSLOGLEVEL'}} = "selected='selected'";
|
$selected{'SYSLOGLEVEL'}{$wlanapsettings{'SYSLOGLEVEL'}} = "selected='selected'";
|
||||||
$selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
|
$selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
|
||||||
|
|
||||||
@@ -437,20 +428,7 @@ END
|
|||||||
;
|
;
|
||||||
print <<END
|
print <<END
|
||||||
<tr><td width='25%' class='base'>HT Caps: </td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
|
<tr><td width='25%' class='base'>HT Caps: </td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
|
||||||
<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'>
|
<tr><td width='25%' class='base'>Tx Power: </td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>
|
||||||
END
|
|
||||||
;
|
|
||||||
|
|
||||||
if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
|
|
||||||
print "<select name='TXPOWER'>";
|
|
||||||
foreach $txpower (@txpower){
|
|
||||||
print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option> dBm";
|
|
||||||
}
|
|
||||||
print " </select></td></tr>";
|
|
||||||
} else {
|
|
||||||
print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
|
|
||||||
}
|
|
||||||
print <<END
|
|
||||||
<tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'>
|
<tr><td width='25%' class='base'>Loglevel (hostapd): </td><td class='base' width='25%'>
|
||||||
<select name='SYSLOGLEVEL'>
|
<select name='SYSLOGLEVEL'>
|
||||||
<option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
|
<option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
|
||||||
@@ -508,9 +486,6 @@ print <<END
|
|||||||
END
|
END
|
||||||
;
|
;
|
||||||
my @status;
|
my @status;
|
||||||
if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
|
|
||||||
@status = `wlanconfig $wlanapsettings{'INTERFACE'} list`;
|
|
||||||
}
|
|
||||||
if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
|
if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
|
||||||
@status = `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump && echo ""`;
|
@status = `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump && echo ""`;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user