wireless: Show signal quality in percent

[people/stevee/network.git] / src / hooks / zones / wireless

diff --git a/src/hooks/zones/wireless b/src/hooks/zones/wireless
index 05c9a797ed7ce10b674e1c653741ef27f16a6044..bd202f2a4c2d4a1a789040fa181ac4f5916fb497 100644 (file)
--- a/src/hooks/zones/wireless
+++ b/src/hooks/zones/wireless
@@ -21,12 +21,11 @@
 
 . /usr/lib/network/header-zone
 
-HOOK_SETTINGS="HOOK PHY MAC MTU SSID KEY ENCRYPTION"
+HOOK_SETTINGS="HOOK PHY MAC SSID KEY ENCRYPTION_MODE"
 
 # Default values
 ADDRESS=$(mac_generate)
 PHY=
-MTU=1500
 SSID=
 KEY=
 ENCRYPTION_MODE=
@@ -38,7 +37,6 @@ hook_check_settings() {
                assert ismac ADDRESS
        fi
 
-       assert isinteger MTU
        assert ismac PHY
 
        if [ -n "${ENCRYPTION_MODE}" ]; then
@@ -139,13 +137,13 @@ hook_status() {
        local bssid=$(wpa_cli_status_get ${zone} bssid)
        assert isset bssid
 
+       local frequency=$(wpa_cli_bss_get_frequency "${zone}" "${bssid}")
+       cli_print_fmt1 3 "Channel" "$(wireless_frequency_to_channel ${frequency}) (${frequency} MHz)"
        cli_print_fmt1 3 "BSSID" "${bssid}"
-       cli_print_fmt1 3 "Frequency" \
-               "$(wpa_cli_bss_get_frequency ${zone} ${bssid}) MHz"
        cli_print_fmt1 3 "Noise" \
                "$(wpa_cli_bss_get_noise ${zone} ${bssid})"
        cli_print_fmt1 3 "Quality" \
-               "$(wpa_cli_bss_get_quality ${zone} ${bssid})"
+               "$(wpa_cli_bss_get_quality ${zone} ${bssid})%%"
        cli_print_fmt1 3 "Flags" \
                "$(wpa_cli_bss_get_flags ${zone} ${bssid})"
        cli_space