webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-11 09:48:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

index.cgi: Update wireless functions to use iw instead of iwconfig

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-09-20 13:42:05 +02:00
parent 67597f2643
commit 65ec7b9d83
2 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/cfgroot/network-functions.pl
View File

@@ -438,7 +438,7 @@ sub _get_wireless_status($) {
my $intf = shift; my $intf = shift;
if (!$wireless_status{$intf}) { if (!$wireless_status{$intf}) {
$wireless_status{$intf} = join('\n', &General::system_output("iwconfig", "$intf")); $wireless_status{$intf} = join(/\n/, &General::system_output("iw", "dev", "$intf", "link"));
} }
return $wireless_status{$intf}; return $wireless_status{$intf};
@@ -447,7 +447,7 @@ sub _get_wireless_status($) {
sub wifi_get_essid($) { sub wifi_get_essid($) {
my $status = &_get_wireless_status(shift); my $status = &_get_wireless_status(shift);
my ($essid) = $status =~ /ESSID:\"(.*)\"/; my ($essid) = $status =~ /^\s+SSID: (.*)$/m;
return $essid; return $essid;
} }
@@ -455,15 +455,15 @@ sub wifi_get_essid($) {
sub wifi_get_frequency($) { sub wifi_get_frequency($) {
my $status = &_get_wireless_status(shift); my $status = &_get_wireless_status(shift);
my ($frequency) = $status =~ /Frequency:(\d+\.\d+ GHz)/; my ($frequency) = $status =~ /^\s+freq: (\d+\.\d+)/m;
return $frequency; return $frequency / 1000 . " GHz";
} }
sub wifi_get_access_point($) { sub wifi_get_access_point($) {
my $status = &_get_wireless_status(shift); my $status = &_get_wireless_status(shift);
my ($access_point) = $status =~ /Access Point: ([0-9A-F:]+)/; my ($access_point) = $status =~ /^Connected to ([0-9a-f:]+)/;
return $access_point; return $access_point;
} }
@@ -471,27 +471,15 @@ sub wifi_get_access_point($) {
sub wifi_get_bit_rate($) { sub wifi_get_bit_rate($) {
my $status = &_get_wireless_status(shift); my $status = &_get_wireless_status(shift);
my ($bit_rate) = $status =~ /Bit Rate=(\d+ [GM]b\/s)/; my ($bit_rate) = $status =~ /^\s+rx bitrate: (\d+(?:\.\d+) MBit\/s)/m;
return $bit_rate; return $bit_rate;
} }
sub wifi_get_link_quality($) {
my $status = &_get_wireless_status(shift);
my ($cur, $max) = $status =~ /Link Quality=(\d+)\/(\d+)/;
if($max > 0) {
return sprintf('%.0f', ($cur * 100) / $max);
}
return 0;
}
sub wifi_get_signal_level($) { sub wifi_get_signal_level($) {
my $status = &_get_wireless_status(shift); my $status = &_get_wireless_status(shift);
my ($signal_level) = $status =~ /Signal level=(\-\d+ dBm)/; my ($signal_level) = $status =~ /^\s+signal: (\-\d+ dBm)/m;
return $signal_level; return $signal_level;
} }

3
html/cgi-bin/index.cgi
View File

@@ -199,7 +199,6 @@ END
my $frequency = &Network::wifi_get_frequency($iface); my $frequency = &Network::wifi_get_frequency($iface);
my $access_point = &Network::wifi_get_access_point($iface); my $access_point = &Network::wifi_get_access_point($iface);
my $bit_rate = &Network::wifi_get_bit_rate($iface); my $bit_rate = &Network::wifi_get_bit_rate($iface);
my $link_quality = &Network::wifi_get_link_quality($iface);
my $signal_level = &Network::wifi_get_signal_level($iface); my $signal_level = &Network::wifi_get_signal_level($iface);
print <<END; print <<END;
@@ -224,7 +223,7 @@ END
$bit_rate $bit_rate
</td> </td>
<td style="text-align: center"> <td style="text-align: center">
$link_quality% @ $signal_level $signal_level
</td> </td>
</tr> </tr>
END END