luci-0.10: merge r7919

[project/luci.git] / contrib / package / iwinfo / src / iwinfo.lua

diff --git a/contrib/package/iwinfo/src/iwinfo.lua b/contrib/package/iwinfo/src/iwinfo.lua
index 1de43fa..8110220 100755 (executable)
--- a/contrib/package/iwinfo/src/iwinfo.lua
+++ b/contrib/package/iwinfo/src/iwinfo.lua
@@ -62,7 +62,10 @@ function print_info(api, dev)
                n(iw.bitrate(dev)) / 1000)
 
        printf("          Encryption: %s",
-               s(enc and enc.description))
+               s(enc and enc.description or "None"))
+
+       printf("          Supports VAPs: %s",
+               iw.mbssid_support(dev) and "yes" or "no")
 
        print("")
 end
@@ -85,7 +88,7 @@ function print_scan(api, dev)
                                s(se.signal), n(se.quality), n(se.quality_max))
 
                        printf("          Encryption: %s",
-                               s(se.encryption.description))
+                               s(se.encryption.description or "None"))
 
                        print("")
                end
@@ -137,11 +140,13 @@ end
 function print_assoclist(api, dev)
        local iw = iwinfo[api]
        local al = iw.assoclist(dev)
+       local ns = iw.noise(dev)
        local ai, ae
 
        if al and next(al) then
                for ai, ae in pairs(al) do
-                       printf("%s  %s dBm", ai, s(ae.signal))
+                       printf("%s  %s dBm / %d dBm (SNR %d)",
+                               ai, s(ae.signal), ns, n(ae.signal) - ns)
                end
        else
                print("No client connected or no information available")