diff options
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_network/wifi_overview.htm | 221 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_network/wifi_status.htm | 2 |
2 files changed, 162 insertions, 61 deletions
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 9f0354cb88..20f0e8d6ec 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -72,33 +72,160 @@ $Id$ end end - function guess_wifi_signal(scale) - local icon - - if scale < 0 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"]] = e["IP address"] end) + sys.net.arptable(function(e) arpcache[e["HW address"]:upper()] = e["IP address"] end) + + local netlist = { } + local netdevs = { } + + 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 -%> <%+header%> +<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)%>; + + (function() { + iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null, + function(x) + { + var st = x.responseText ? eval('(' + x.responseText + ')') : null; + if (st) + { + var assoctable = document.getElementById('iw-assoclist'); + if (assoctable) + while (assoctable.rows.length > 1) + assoctable.rows[1].parentNode.removeChild(assoctable.rows[1]); + + for( var i = 0; i < st.length; i++ ) + { + var iw = st[i]; + var p = (100 / iw.quality_max * iw.quality); + var q = (iw.bssid && iw.channel) ? 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"; + + 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) + info.innerHTML = String.format( + '<strong><%:SSID%>:</strong> %s | ' + + '<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%>' + ); + + var dev = document.getElementById(wifidevs[iw.id] + '-iw-devinfo'); + if (dev) + 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 : '?' + ); + + if (assoctable) + { + var assoclist = [ ]; + for( var bssid in iw.assoclist ) + { + assoclist.push(iw.assoclist[bssid]); + assoclist[assoclist.length-1].bssid = bssid; + } + + 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); + } + } + } + + 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>'; + + assoctable.rows[0].parentNode.appendChild(tr); + } + } + } + ) + + window.setTimeout(arguments.callee, 5000); + })(); +]]></script> + <h2><a id="content" name="content"><%:Wireless Overview%></a></h2> <div class="cbi-map"> @@ -112,10 +239,7 @@ $Id$ <td style="width:34px"><img src="<%=resource%>/icons/wifi<%=dev:is_up() and "" or "_disabled"%>.png" style="float:left; margin-right:10px" /></td> <td colspan="2" style="text-align:left"> <big><strong><%=guess_wifi_hw(dev:name())%> (<%=dev:name()%>)</strong></big><br /> - <% if nets[1] then %> - <strong>Channel:</strong> <%=nets[1]:channel() or "?"%> (<%=nets[1]:frequency() or "?"%> GHz) | - <strong>Bitrate:</strong> <%=nets[1]:bitrate() or "?"%> Mb/s - <% end %> + <span id="<%=dev:name()%>-iw-devinfo"></span> </td> <td style="width:40px"> <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> @@ -129,15 +253,12 @@ $Id$ <% 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:signal_level())%>" title="Signal: <%=net:signal()%> dBm / Noise: <%=net:noise()%> dBm" /><br /> - <small><%=net:signal_percent()%>%</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:active_ssid())%> | - <strong>Mode:</strong> <%=net:active_mode_i18n()%><br /> - <strong>BSSID:</strong> <%=net:active_bssid()%> | - <strong>Encryption:</strong> <%=net:active_encryption()%> + <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="<%=net:adminlink()%>"><img style="border:none" src="<%=resource%>/cbi/edit.gif" alt="Edit this network" title="Edit this network" /></a> @@ -160,43 +281,23 @@ $Id$ <% end %> - - <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 in ipairs(devices) do local nets = dev:get_wifinets() %> - <% for _, net in ipairs(nets) do %> - <% for mac, info in utl.kspairs(net:assoclist()) do count = count + 1 %> - <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + (count % 2)%>"> - <td class="cbi-value-field"><img src="<%=guess_wifi_signal(net:signal_level(info.signal, info.noise))%>" title="Signal: <%=info.signal%> dBm / Noise: <%=info.noise%> dBm" /></td> - <td class="cbi-value-field"><%=net:active_ssid()%></td> - <td class="cbi-value-field"><%=mac%></td> - <td class="cbi-value-field"><%=arpcache[mac:lower()] 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> diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm index 63bd26147d..8c50843ad3 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm @@ -30,7 +30,7 @@ var s = document.getElementById('<%=self.option%>-iw-signal'); if (s) s.innerHTML = String.format( - '<img src="%s" title="Signal: %d dBm / Noise: %d dBm" /><br />' + + '<img src="%s" title="<%:Signal%>: %d dBm / <%Noise%>: %d dBm" /><br />' + '<small>%d%%</small>', icon, iw.signal, iw.noise, p ); |