modules/admin-full: Detect hostap Prism2/2.5/3 hardware

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / wifi_overview.htm

diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
index 6a10206..4682e89 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm
@@ -16,19 +16,34 @@ $Id$
 <%-
 
        local sys = require "luci.sys"
+       local fs = require "luci.fs"
        local utl = require "luci.util"
        local uci = require "luci.model.uci".cursor()
        local ntm = require "luci.model.network"
 
+       local has_iwinfo = pcall(require, "iwinfo")
+
        ntm.init(uci)
 
        function guess_wifi_hw(ifname)
+               local bands = ""
                local name, idx = ifname:match("^([a-z]+)(%d+)")
                idx = tonumber(idx)
 
+               if has_iwinfo then
+                       local iw = luci.sys.wifi.getiwinfo(ifname)
+                       local bl = iw.hwmodelist
+                       if bl and next(bl) then
+                               if bl.a then bands = bands .. "a" end
+                               if bl.b then bands = bands .. "b" end
+                               if bl.g then bands = bands .. "g" end
+                               if bl.n then bands = bands .. "n" end
+                       end
+               end
+
                -- wl.o
                if name == "wl" then
-                       local name = "Broadcom 802.11 Wireless Controller"
+                       local name = "Broadcom 802.11%s Wireless Controller" % bands
                        local nm   = 0
 
                        local fd = nixio.open("/proc/bus/pci/devices", "r")
@@ -56,19 +71,23 @@ $Id$
 
                -- madwifi
                elseif name == "ath" or name == "wifi" then
-                       return "Atheros 802.11 Wireless Controller"
+                       return "Atheros 802.11%s Wireless Controller" % bands
 
                -- ralink
                elseif name == "ra" then
-                       return "RaLink 802.11 Wireless Controller"
+                       return "RaLink 802.11%s Wireless Controller" % bands
 
-               -- prism?
+               -- hermes
                elseif name == "eth" then
-                       return "Prism 802.11 Wireless Controller"
+                       return "Prism 802.11%s Wireless Controller" % bands
+
+               -- hostap
+               elseif name == "wlan" and fs.isdirectory("/proc/net/hostap/" .. ifname) then
+                       return "Prism2/2.5/3 802.11%s Wireless Controller" % bands
 
                -- dunno yet
                else
-                       return "Generic 802.11 Wireless Controller"
+                       return "Generic 802.11%s Wireless Controller" % bands
                end
        end
 
@@ -87,8 +106,6 @@ $Id$
                        netdevs[net:ifname()] = dev:name()
                end
        end
-
-       local has_iwinfo = pcall(require, "iwinfo")
 -%>
 
 <%+header%>
@@ -155,7 +172,7 @@ $Id$
                                                {
                                                        if (is_assoc)
                                                                info.innerHTML = String.format(
-                                                                       '<strong><%:SSID%>:</strong> %s | ' +
+                                                                       '<strong><%:SSID%>:</strong> %h | ' +
                                                                        '<strong><%:Mode%>:</strong> %s<br />' +
                                                                        '<strong><%:BSSID%>:</strong> %s | ' +
                                                                        '<strong><%:Encryption%>:</strong> %s',
@@ -163,7 +180,12 @@ $Id$
                                                                                iw.encryption ? iw.encryption.description : '<%:None%>'
                                                                );
                                                        else
-                                                               info.innerHTML = '<em><%:Wireless is disabled or not associated%></em>';
+                                                               info.innerHTML = String.format(
+                                                                       '<strong><%:SSID%>:</strong> %h | ' +
+                                                                       '<strong><%:Mode%>:</strong> %s<br />' +
+                                                                       '<em><%:Wireless is disabled or not associated%></em>',
+                                                                               iw.ssid || '?', iw.mode
+                                                               );
                                                }
 
                                                var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo');
@@ -194,8 +216,8 @@ $Id$
 
                                                        for( var j = 0; j < assoclist.length; j++ )
                                                        {
-                                                               var tr = document.createElement('tr');
-                                                                       tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((j % 2) + (i % 2));
+                                                               var tr = assoctable.insertRow(-1);
+                                                                   tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((j % 2) + (i % 2));
 
                                                                var icon;
                                                                var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
@@ -210,37 +232,31 @@ $Id$
                                                                else
                                                                        icon = "<%=resource%>/icons/signal-75-100.png";
 
-                                                               tr.innerHTML = String.format(
-                                                                       '<td class="cbi-value-field">' +
-                                                                               '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />' +
-                                                                       '</td>' +
-                                                                       '<td class="cbi-value-field">%s</td>' +
-                                                                       '<td class="cbi-value-field">%s</td>' +
-                                                                       '<td class="cbi-value-field">%s</td>' +
-                                                                       '<td class="cbi-value-field">%d dBm</td>' +
-                                                                       '<td class="cbi-value-field">%d dBm</td>',
-                                                                               icon,
-                                                                               assoclist[j].signal, assoclist[j].noise,
-                                                                               iw.ssid ? iw.ssid : '?',
-                                                                               assoclist[j].bssid,
-                                                                               arptable[assoclist[j].bssid]
-                                                                                       ? arptable[assoclist[j].bssid] : '?',
-                                                                               assoclist[j].signal, assoclist[j].noise
+                                                               tr.insertCell(-1).innerHTML = String.format(
+                                                                       '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" />',
+                                                                       icon, assoclist[j].signal, assoclist[j].noise
                                                                );
 
-                                                               assoctable.rows[0].parentNode.appendChild(tr);
+                                                               tr.insertCell(-1).innerHTML = iw.ssid ? iw.ssid : '?';
+                                                               tr.insertCell(-1).innerHTML = assoclist[j].bssid;
+
+                                                               tr.insertCell(-1).innerHTML = arptable[assoclist[j].bssid]
+                                                                       ? arptable[assoclist[j].bssid] : '?';
+
+                                                               tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].signal);
+                                                               tr.insertCell(-1).innerHTML = String.format('%d dBm', assoclist[j].noise);
                                                        }
                                                }
                                        }
 
                                        if (assoctable && assoctable.rows.length == 1)
                                        {
-                                               var tr = document.createElement('tr');
-                                                       tr.className = 'cbi-section-table-row';
-
-                                               tr.innerHTML = '<td class="cbi-value-field" colspan="6"><br /><em><%:No information available%></em></td>';
+                                               var tr = assoctable.insertRow(-1);
+                                                   tr.className = 'cbi-section-table-row';
 
-                                               assoctable.rows[0].parentNode.appendChild(tr);
+                                               var td = tr.insertCell(-1);
+                                                   td.colSpan = 6;
+                                                   td.innerHTML = '<br /><em><%:No information available%></em>';
                                        }
 
                                        for (var dev in devup)