modules/admin-full: rework wifi status templates
[project/luci.git] / modules / admin-full / luasrc / view / admin_network / wifi_overview.htm
index 251f767..29de11c 100644 (file)
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008-2009 Steven Barth <steven@midlink.org>
-Copyright 2008-2009 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,15 +17,32 @@ $Id$
 
        local sys = require "luci.sys"
        local utl = require "luci.util"
-       local uci = require "luci.model.uci".cursor_state()
+       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")
@@ -53,141 +70,249 @@ $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?
                elseif name == "eth" then
-                       return "Prism 802.11 Wireless Controller"
+                       return "Prism 802.11%s Wireless Controller" % bands
 
                -- dunno yet
                else
-                       return "Unkown 802.11 Wireless Controller"
+                       return "Generic 802.11%s Wireless Controller" % bands
                end
        end
 
-       function guess_wifi_signal(info)
-               local snr = -1 * ((info.noise or 0) - (info.signal or 0))
-               local scale = math.floor(snr / 5)
-               local icon
-
-               if not info.bssid or info.bssid == "00:00:00:00:00:00" then
-                       icon = resource .. "/icons/signal-none.png"
-               elseif scale < 1 then
-                       icon = resource .. "/icons/signal-0.png"
-               elseif scale < 2 then
-                       icon = resource .. "/icons/signal-0-25.png"
-               elseif scale < 3 then
-                       icon = resource .. "/icons/signal-25-50.png"
-               elseif scale < 4 then
-                       icon = resource .. "/icons/signal-50-75.png"
-               else
-                       icon = resource .. "/icons/signal-75-100.png"
-               end
-
-               return icon
-       end
+       local devices  = ntm:get_wifidevs()
+       local arpcache = { }
+       sys.net.arptable(function(e) arpcache[e["HW address"]:upper()] = e["IP address"] end)
 
-       function percent_wifi_signal(info)
-               local qc = info.quality or 0
-               local qm = info.quality_max or 0
+       local netlist = { }
+       local netdevs = { }
 
-               if info.bssid and qc > 0 and qm > 0 then
-                       return math.floor((100 / qm) * qc)
-               else
-                       return 0
+       local dev
+       for _, dev in ipairs(devices) do
+               local net
+               for _, net in ipairs(dev:get_wifinets()) do
+                       netlist[#netlist+1] = net:ifname()
+                       netdevs[net:ifname()] = dev:name()
                end
        end
+-%>
 
-       function find_wifi_devices()
-               local devs = { }
-               uci:foreach("wireless", "wifi-device",
-                       function(s)
-                               local dev = s['.name']
-                               local act = 0
-                               devs[dev] = { active = 0, networks = { } }
-
-                               uci:foreach("wireless", "wifi-iface",
-                                       function(s)
-                                               if s.device == dev then
-                                                       if s.up == "1" then act = act + 1 end
-                                                       devs[dev].networks[#devs[dev].networks+1] = {
-                                                               active = (s.up == "1"),
-                                                               ifname = s.ifname,
-                                                               info   = sys.wifi.getiwinfo(s.ifname or s.device)
+<%+header%>
+
+<% if not has_iwinfo then %>
+       <div class="errorbox">
+               <strong><%:Package libiwinfo required!%></strong><br />
+               <%_The <em>libiwinfo</em> package is not installed. You must install this component for working wireless configuration!%>
+       </div>
+<% end %>
+
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
+<script type="text/javascript">//<![CDATA[
+       var iwxhr = new XHR();
+       var wifidevs = <%=luci.http.write_json(netdevs)%>;
+       var arptable = <%=luci.http.write_json(arpcache)%>;
+
+       var update_status = function() {
+               iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null,
+                       function(x, st)
+                       {
+                               if (st)
+                               {
+                                       var assoctable = document.getElementById('iw-assoclist');
+                                       if (assoctable)
+                                               while (assoctable.rows.length > 1)
+                                                       assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]);
+
+                                       var devup = { };
+
+                                       for( var i = 0; i < st.length; i++ )
+                                       {
+                                               var iw = st[i];
+                                               var is_assoc = (iw.bssid && iw.channel);
+                                               var p = (100 / iw.quality_max * iw.quality);
+                                               var q = is_assoc ? p : -1;
+
+                                               var icon;
+                                               if (q < 0)
+                                                       icon = "<%=resource%>/icons/signal-none.png";
+                                               else if (q == 0)
+                                                       icon = "<%=resource%>/icons/signal-0.png";
+                                               else if (q < 25)
+                                                       icon = "<%=resource%>/icons/signal-0-25.png";
+                                               else if (q < 50)
+                                                       icon = "<%=resource%>/icons/signal-25-50.png";
+                                               else if (q < 75)
+                                                       icon = "<%=resource%>/icons/signal-50-75.png";
+                                               else
+                                                       icon = "<%=resource%>/icons/signal-75-100.png";
+
+                                               if (!devup[wifidevs[iw.id]])
+                                                       devup[wifidevs[iw.id]] = is_assoc;
+
+                                               var sig = document.getElementById(iw.id + '-iw-signal');
+                                               if (sig)
+                                                       sig.innerHTML = String.format(
+                                                               '<img src="%s" title="<%:Signal%>: %d dBm / <%:Noise%>: %d dBm" /><br />' +
+                                                               '<small>%d%%</small>', icon, iw.signal, iw.noise, p
+                                                       );
+
+                                               var info = document.getElementById(iw.id + '-iw-status');
+                                               if (info)
+                                               {
+                                                       if (is_assoc)
+                                                               info.innerHTML = String.format(
+                                                                       '<strong><%:SSID%>:</strong> %h | ' +
+                                                                       '<strong><%:Mode%>:</strong> %s<br />' +
+                                                                       '<strong><%:BSSID%>:</strong> %s | ' +
+                                                                       '<strong><%:Encryption%>:</strong> %s',
+                                                                               iw.ssid, iw.mode, iw.bssid,
+                                                                               iw.encryption ? iw.encryption.description : '<%:None%>'
+                                                               );
+                                                       else
+                                                               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');
+                                               if (dev)
+                                               {
+                                                       if (is_assoc)
+                                                               dev.innerHTML = String.format(
+                                                                       '<strong><%:Channel%>:</strong> %s (%s GHz) | ' +
+                                                                       '<strong><%:Bitrate%>:</strong> %s Mb/s',
+                                                                               iw.channel ? iw.channel : '?',
+                                                                               iw.frequency ? iw.frequency / 1000 : '?',
+                                                                               iw.bitrate ? iw.bitrate / 1000 : '?'
+                                                               );
+                                                       else
+                                                               dev.innerHTML = '';
+                                               }
+
+                                               if (assoctable)
+                                               {
+                                                       var assoclist = [ ];
+                                                       for( var bssid in iw.assoclist )
+                                                       {
+                                                               assoclist.push(iw.assoclist[bssid]);
+                                                               assoclist[assoclist.length-1].bssid = bssid;
                                                        }
-                                               end
-                                       end)
 
-                               devs[dev].hwname = guess_wifi_hw(dev)
-                               devs[dev].active = (act > 0)
-                       end)
+                                                       assoclist.sort(function(a, b) { a.bssid < b.bssid });
+
+                                                       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 icon;
+                                                               var q = (-1 * (assoclist[j].noise - assoclist[j].signal)) / 5;
+                                                               if (q < 1)
+                                                                       icon = "<%=resource%>/icons/signal-0.png";
+                                                               else if (q < 2)
+                                                                       icon = "<%=resource%>/icons/signal-0-25.png";
+                                                               else if (q < 3)
+                                                                       icon = "<%=resource%>/icons/signal-25-50.png";
+                                                               else if (q < 4)
+                                                                       icon = "<%=resource%>/icons/signal-50-75.png";
+                                                               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
+                                                               );
+
+                                                               assoctable.rows[0].parentNode.appendChild(tr);
+                                                       }
+                                               }
+                                       }
 
-               return devs
-       end
+                                       if (assoctable && assoctable.rows.length == 1)
+                                       {
+                                               var tr = document.createElement('tr');
+                                                       tr.className = 'cbi-section-table-row';
 
-       function find_wifi_frequency(state)
-               if state.active then
-                       return string.format("%d (%.03f GHz)",
-                               state.networks[1].info.channel,
-                               state.networks[1].info.frequency / 1000);
-               else
-                       return "n/a"
-               end
-       end
+                                               tr.innerHTML = '<td class="cbi-value-field" colspan="6"><br /><em><%:No information available%></em></td>';
 
+                                               assoctable.rows[0].parentNode.appendChild(tr);
+                                       }
 
-       local devices  = find_wifi_devices()
-       local arpcache = { }
-       sys.net.arptable(function(e) arpcache[e["HW address"]] = e["IP address"] end)
--%>
+                                       for (var dev in devup)
+                                       {
+                                               var img = document.getElementById(dev + '-iw-upstate');
+                                               if (img)
+                                                       img.src = '<%=resource%>/icons/wifi_big' + (devup[dev] ? '' : '_disabled') + '.png';
+                                       }
+                               }
 
-<%+header%>
+                               window.setTimeout(update_status, 5000);
+                       }
+               )
+       };
 
-<h2><a id="content" name="content"><%:a_s_iw_overview Wireless Overview%></a></h2>
+       update_status();
+//]]></script>
+
+<h2><a id="content" name="content"><%:Wireless Overview%></a></h2>
 
 <div class="cbi-map">
 
-       <% for dev, state in utl.kspairs(devices) do %>
-       <!-- device <%=dev%> -->
+       <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %>
+       <!-- device <%=dev:name()%> -->
        <fieldset class="cbi-section">
                <table class="cbi-section-table" style="margin:10px; empty-cells:hide">
                        <!-- physical device -->
                        <tr>
-                               <td style="width:34px"><img src="<%=resource%>/icons/wifi<%=state.active and "" or "_disabled"%>.png" style="float:left; margin-right:10px" /></td>
+                               <td style="width:34px"><img src="<%=resource%>/icons/wifi_big_disabled.png" style="float:left; margin-right:10px" id="<%=dev:name()%>-iw-upstate" /></td>
                                <td colspan="2" style="text-align:left">
-                                       <big><strong><%=state.hwname%> (<%=dev%>)</strong></big><br />
-                                       <strong>Channel:</strong> <%=find_wifi_frequency(state)%> |
-                                       <strong>Bitrate:</strong> <%=state.active and (state.networks[1].info.bitrate / 1000) .. " Mb/s" or "n/a"%>
+                                       <big><strong><%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)</strong></big><br />
+                                       <span id="<%=dev:name()%>-iw-devinfo"></span>
                                </td>
                                <td style="width:40px">
-                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_join?device="..dev)%>"><img style="border:none" src="<%=resource%>/cbi/find.gif" alt="Find and join network" title="Find and join network" /></a>
-                                       <a href="#"><img style="border:none" src="<%=resource%>/cbi/add.gif" alt="Provide new network" title="Provide new network" /></a>
+                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_join")%>?device=<%=dev:name()%>"><img style="border:none" src="<%=resource%>/cbi/find.gif" alt="<%:Find and join network%>" title="<%:Find and join network%>" /></a>
+                                       <a href="<%=luci.dispatcher.build_url("admin/network/wireless_add")%>?device=<%=dev:name()%>"><img style="border:none" src="<%=resource%>/cbi/add.gif" alt="<%:Provide new network%>" title="<%:Provide new network%>" /></a>
                                </td>
                        </tr>
                        <!-- /physical device -->
 
                        <!-- network list -->
-                       <% if #state.networks > 0 then %>
-                               <% for i, net in ipairs(state.networks) do %>
+                       <% if #nets > 0 then %>
+                               <% for i, net in ipairs(nets) do %>
                                <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>">
                                        <td></td>
-                                       <td class="cbi-value-field" style="width:16px; padding:3px">
-                                               <img src="<%=guess_wifi_signal(net.info)%>" title="Signal: <%=net.info.signal%> dBm / Noise: <%=net.info.noise%> dBm" /><br />
-                                               <small><%=percent_wifi_signal(net.info)%>%</small>
+                                       <td class="cbi-value-field" style="width:16px; padding:3px" id="<%=net:ifname()%>-iw-signal">
+                                               <img src="<%=resource%>/icons/signal-none.png" title="<%:Not associated%>" /><br />
+                                               <small>0%</small>
                                        </td>
-                                       <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-                                               <strong>SSID:</strong> <%=utl.pcdata(net.info.ssid)%> |
-                                               <strong>Mode:</strong> <%=net.info.mode%><br />
-                                               <strong>BSSID:</strong> <%=net.info.bssid%> |
-                                               <strong>Encryption:</strong> <%=net.info.enctype%>
+                                       <td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px" id="<%=net:ifname()%>-iw-status">
+                                               <em><%:Collecting data...%></em>
                                        </td>
                                        <td class="cbi-value-field" style="width:40px">
-                                               <a href="<%=REQUEST_URI%>/<%=dev%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a>
-                                               <a href="#"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="Delete this network" title="Delete this network" /></a>
+                                               <a href="<%=net:adminlink()%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="<%:Edit this network%>" title="<%:Edit this network%>" /></a>
+                                               <a href="<%=luci.dispatcher.build_url("admin/network/wireless_delete", net:ifname())%>" onclick="return confirm('<%:Really delete this wireless network? The deletion cannot be undone!\nYou might loose access to this router if you are connected via this network.%>')"><img style="border:none" src="<%=resource%>/cbi/remove.gif" alt="<%:Delete this network%>" title="<%:Delete this network%>" /></a>
                                        </td>
                                </tr>
                                <% end %>
@@ -195,54 +320,34 @@ $Id$
                                <tr class="cbi-section-table-row cbi-rowstyle-2">
                                        <td></td>
                                        <td colspan="3" class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-                                               <em>(No network configured on this device)</em>
+                                               <em><%:No network configured on this device%></em>
                                        </td>
                                </tr>
                        <% end %>
                        <!-- /network list -->
                </table>
        </fieldset>
-       <!-- /device <%=dev%> -->
+       <!-- /device <%=dev:name()%> -->
        <% end %>
 
 
-
-
-       <h2><a id="content" name="content"><%:a_s_iw_overview2 Associated Stations%></a></h2>
+       <h2><a id="content" name="content"><%:Associated Stations%></a></h2>
 
        <fieldset class="cbi-section">
-               <table class="cbi-section-table" style="margin:10px; width:50%">
+               <table class="cbi-section-table" style="margin:10px; width:50%" id="iw-assoclist">
                        <tr class="cbi-section-table-titles">
                                <th class="cbi-section-table-cell"></th>
-                               <th class="cbi-section-table-cell">SSID</th>
-                               <th class="cbi-section-table-cell">MAC</th>
-                               <th class="cbi-section-table-cell">Address</th>
-                               <th class="cbi-section-table-cell">Signal</th>
-                               <th class="cbi-section-table-cell">Noise</th>
+                               <th class="cbi-section-table-cell"><%:SSID%></th>
+                               <th class="cbi-section-table-cell"><%:MAC%></th>
+                               <th class="cbi-section-table-cell"><%:Address%></th>
+                               <th class="cbi-section-table-cell"><%:Signal%></th>
+                               <th class="cbi-section-table-cell"><%:Noise%></th>
                        </tr>
-
-                       <% local count = -1 %>
-                       <% for dev, state in utl.kspairs(devices) do %>
-                               <% for _, net in ipairs(state.networks) do %>
-                                       <% for mac, info in utl.kspairs(net.info.assoclist) do info.bssid = mac; count = count + 1 %>
-                                       <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + (count % 2)%>">
-                                               <td class="cbi-value-field"><img src="<%=guess_wifi_signal(info)%>" title="Signal: <%=info.signal%> dBm / Noise: <%=info.noise%> dBm" /></td>
-                                               <td class="cbi-value-field"><%=net.info.ssid%></td>
-                                               <td class="cbi-value-field"><%=mac%></td>
-                                               <td class="cbi-value-field"><%=arpcache[mac] or "n/a"%></td>
-                                               <td class="cbi-value-field"><%=info.signal%> dBm</td>
-                                               <td class="cbi-value-field"><%=info.noise%> dBm</td>
-                                       </tr>
-                                       <% end %>
-                               <% end %>
-                       <% end %>
-                       <% if count <= 0 then %>
                        <tr class="cbi-section-table-row cbi-rowstyle-2">
                                <td class="cbi-value-field" colspan="6">
-                                       <em>No information available</em>
+                                       <em><%:Collecting data...%></em>
                                </td>
                        </tr>
-                       <% end %>
                </table>
        </fieldset>
 </div>