+
0%
-
+
<%:Collecting data...%>
-
<% end %>
<% else %>
-
+
<%:No network configured on this device%>
@@ -421,30 +341,14 @@
<% end %>
-
+
<% end %>
<%:Associated Stations%>
-
+ <%+admin_network/wifi_assoclist%>
<%+footer%>
diff --git a/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
index 85468252e..ad20ea38f 100644
--- a/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
+++ b/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm
@@ -24,21 +24,22 @@
else
icon = "<%=resource%>/icons/signal-75-100.png";
- var s = document.getElementById('<%=self.option%>-iw-signal');
- if (s)
- s.innerHTML = String.format(
- '
' +
- '
%d%%', icon, iw.signal, iw.noise, p
- );
+ var s = document.getElementById('<%=self.option%>-iw-status'),
+ small = s.querySelector('small'),
+ info = s.querySelector('span');
- var d = document.getElementById('<%=self.option%>-iw-description');
- if (d && is_assoc)
- d.innerHTML = String.format(
+ small.innerHTML = info.innerHTML = String.format(
+ '
%d%% ',
+ icon, iw.signal, iw.noise, p
+ );
+
+ if (is_assoc)
+ info.innerHTML = String.format(
'
<%:Mode%>: %s | ' +
'
<%:SSID%>: %h
' +
- '
<%:BSSID%>: %s | ' +
+ '
<%:BSSID%>: %s
' +
'
<%:Encryption%>: %s
' +
- '
<%:Channel%>: %d (%.3f <%:GHz%>) | ' +
+ '
<%:Channel%>: %d (%.3f <%:GHz%>)
' +
'
<%:Tx-Power%>: %d <%:dBm%>
' +
'
<%:Signal%>: %d <%:dBm%> | ' +
'
<%:Noise%>: %d <%:dBm%>
' +
@@ -50,8 +51,8 @@
iw.txpower, iw.signal, iw.noise,
iw.bitrate ? iw.bitrate : 0, iw.country
);
- else if (d)
- d.innerHTML = String.format(
+ else
+ info.innerHTML = String.format(
'
<%:SSID%>: %h | ' +
'
<%:Mode%>: %s
' +
'
<%:Wireless is disabled or not associated%>',
@@ -62,17 +63,13 @@
);
//]]>
-
-
-
-
-
-
0%
-
-
- <%:Collecting data...%>
-
-
-
+
+
+
+
+
+ <%:Collecting data...%>
+
+
<%+cbi/valuefooter%>
diff --git a/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
index db1d0b888..ba0ab0f68 100644
--- a/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
+++ b/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm
@@ -202,22 +202,23 @@
data_rx_peak = Math.max(data_rx_peak, data_rx[i]);
data_tx_peak = Math.max(data_tx_peak, data_tx[i]);
- if (i > 0)
- {
- data_rx_avg = (data_rx_avg + data_rx[i]) / 2;
- data_tx_avg = (data_tx_avg + data_tx[i]) / 2;
- }
- else
- {
- data_rx_avg = data_rx[i];
- data_tx_avg = data_tx[i];
- }
+ data_rx_avg += data_rx[i];
+ data_tx_avg += data_tx[i];
}
+ data_rx_avg = (data_rx_avg / Math.max(data_rx.length, 1));
+ data_tx_avg = (data_tx_avg / Math.max(data_tx.length, 1));
+
+ var size = Math.floor(Math.log2(data_max)),
+ div = Math.pow(2, size - (size % 10)),
+ mult = data_max / div,
+ mult = (mult < 5) ? 2 : ((mult < 50) ? 10 : ((mult < 500) ? 100 : 1000));
+
+ data_max = data_max + (mult * div) - (data_max % (mult * div));
+
/* remember current timestamp, calculate horizontal scale */
data_stamp = data[data.length-1][TIME];
- data_scale = height / (data_max * 1.1);
-
+ data_scale = height / data_max;
/* plot data */
var pt_rx = '0,' + height;
@@ -244,9 +245,9 @@
line_rx.setAttribute('points', pt_rx);
line_tx.setAttribute('points', pt_tx);
- label_25.firstChild.data = bandwidth_label(1.1 * 0.25 * data_max);
- label_50.firstChild.data = bandwidth_label(1.1 * 0.50 * data_max);
- label_75.firstChild.data = bandwidth_label(1.1 * 0.75 * data_max);
+ label_25.firstChild.data = bandwidth_label(0.25 * data_max);
+ label_50.firstChild.data = bandwidth_label(0.50 * data_max);
+ label_75.firstChild.data = bandwidth_label(0.75 * data_max);
label_rx_cur.innerHTML = bandwidth_label(data_rx[data_rx.length-1], true);
label_tx_cur.innerHTML = bandwidth_label(data_tx[data_tx.length-1], true);
@@ -258,6 +259,8 @@
label_tx_peak.innerHTML = bandwidth_label(data_tx_peak, true);
}
);
+
+ XHR.run();
}
}, 1000
);
diff --git a/luci-mod-admin-full/luasrc/view/admin_status/connections.htm b/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
index 30d93f78b..ae8a6bb7c 100644
--- a/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
+++ b/luci-mod-admin-full/luasrc/view/admin_status/connections.htm
@@ -304,6 +304,8 @@
label_otr_peak.innerHTML = Math.floor(data_otr_peak);
}
);
+
+ XHR.run();
}
}, 1000
);
diff --git a/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index ae6a10193..9d282f58b 100644
--- a/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -54,8 +54,6 @@
swap = swapinfo,
connmax = conn_max,
conncount = conn_count,
- leases = stat.dhcp_leases(),
- leases6 = stat.dhcp6_leases(),
wifinets = stat.wifi_networks()
}
@@ -111,11 +109,6 @@
luci.http.prepare_content("application/json")
luci.http.write_json(rv)
- return
- elseif luci.http.formvalue("hosts") == "1" then
- luci.http.prepare_content("application/json")
- luci.http.write_json(luci.sys.net.host_hints())
-
return
end
-%>
@@ -131,7 +124,7 @@
var pc = Math.floor((100 / mn) * vn);
return String.format(
- '
' +
+ '
' +
'
' +
'
' +
'
%s / %s (%d%%)' +
@@ -141,45 +134,6 @@
);
}
- function wifirate(bss, rx) {
- var p = rx ? 'rx_' : 'tx_',
- s = '%.1f <%:Mbit/s%>, %d<%:MHz%>'
- .format(bss[p+'rate'] / 1000, bss[p+'mhz']),
- ht = bss[p+'ht'], vht = bss[p+'vht'],
- mhz = bss[p+'mhz'], nss = bss[p+'nss'],
- mcs = bss[p+'mcs'], sgi = bss[p+'short_gi'];
-
- if (ht || vht) {
- if (vht) s += ', VHT-MCS %d'.format(mcs);
- if (nss) s += ', VHT-NSS %d'.format(nss);
- if (ht) s += ', MCS %s'.format(mcs);
- if (sgi) s += ', <%:Short GI%>';
- }
-
- return s;
- }
-
- function duid2mac(duid) {
- // DUID-LLT / Ethernet
- if (duid.length === 28 && duid.substr(0, 8) === '00010001')
- return duid.substr(16).replace(/(..)(?=..)/g, '$1:').toUpperCase();
-
- // DUID-LL / Ethernet
- if (duid.length === 20 && duid.substr(0, 8) === '00030001')
- return duid.substr(8).replace(/(..)(?=..)/g, '$1:').toUpperCase();
-
- return null;
- }
-
- var npoll = 1;
- var hosts = <%=luci.http.write_json(luci.sys.net.host_hints())%>;
-
- function updateHosts() {
- XHR.get('<%=REQUEST_URI%>', { hosts: 1 }, function(x, data) {
- hosts = data;
- });
- }
-
function labelList(items, offset) {
var rv = [ ];
@@ -206,7 +160,7 @@
return E('div', { class: 'ifacebox' }, [
E('div', { class: 'ifacebox-head center ' + (active ? 'active' : '') },
E('strong', title)),
- E('div', { class: 'ifacebox-body' }, childs)
+ E('div', { class: 'ifacebox-body left' }, childs)
]);
}
@@ -220,9 +174,6 @@
XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 },
function(x, info)
{
- if (!(npoll++ % 5))
- updateHosts();
-
<% if has_mptcp == 0 then %>
var us = document.getElementById('upstream_status_table');
@@ -333,86 +284,7 @@
);
<% end %>
- <% if has_dhcp then %>
- var ls = document.getElementById('lease_status_table');
- if (ls)
- {
- /* clear all rows */
- while (ls.firstElementChild !== ls.lastElementChild)
- ls.removeChild(ls.lastElementChild);
-
- for (var i = 0; i < info.leases.length; i++)
- {
- var timestr;
-
- if (info.leases[i].expires === false)
- timestr = '
<%:unlimited%>';
- else if (info.leases[i].expires <= 0)
- timestr = '
<%:expired%>';
- else
- timestr = String.format('%t', info.leases[i].expires);
-
- ls.appendChild(E('
'.format((i % 2) + 1), [
- E('
', info.leases[i].hostname ? info.leases[i].hostname : '?'),
- E('
', info.leases[i].ipaddr),
- E('
', info.leases[i].macaddr),
- E('
', timestr)
- ]));
- }
-
- if (ls.firstElementChild === ls.lastElementChild)
- ls.appendChild(E('
<%:There are no active leases.%>
'));
- }
-
- var ls6 = document.getElementById('lease6_status_table');
- if (ls6 && info.leases6)
- {
- ls6.parentNode.style.display = 'block';
-
- /* clear all rows */
- while (ls6.firstElementChild !== ls6.lastElementChild)
- ls6.removeChild(ls6.lastElementChild);
-
- for (var i = 0; i < info.leases6.length; i++)
- {
- var timestr;
-
- if (info.leases6[i].expires === false)
- timestr = '
<%:unlimited%>';
- else if (info.leases6[i].expires <= 0)
- timestr = '
<%:expired%>';
- else
- timestr = String.format('%t', info.leases6[i].expires);
-
- var host = hosts[duid2mac(info.leases6[i].duid)],
- name = info.leases6[i].hostname,
- hint = null;
-
- if (!name) {
- if (host)
- hint = host.name || host.ipv4 || host.ipv6;
- }
- else {
- if (host && host.name && info.leases6[i].hostname != host.name)
- hint = host.name;
- }
-
- ls6.appendChild(E('
'.format((i % 2) + 1), [
- E('
', hint ? '
%h (%h)
'.format(name || '?', hint) : (name || '?')),
- E('
', info.leases6[i].ip6addr),
- E('
', info.leases6[i].duid),
- E('
', timestr)
- ]));
- }
-
- if (ls6.firstElementChild === ls6.lastElementChild)
- ls6.appendChild(E('
<%:There are no active leases.%>
'));
- }
- <% end %>
-
<% if has_wifi then %>
- var assoclist = [ ];
-
var ws = document.getElementById('wifi_status_table');
if (ws)
{
@@ -429,21 +301,6 @@
{
var net = dev.networks[nidx];
var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
- var num_assoc = 0;
-
- for (var bssid in net.assoclist)
- {
- var bss = net.assoclist[bssid];
-
- bss.bssid = bssid;
- bss.link = net.link;
- bss.name = net.name;
- bss.ifname = net.ifname;
- bss.radio = dev.name;
-
- assoclist.push(bss);
- num_assoc++;
- }
var icon;
if (!is_assoc)
@@ -466,7 +323,7 @@
'<%:Mode%>', net.mode,
'<%:BSSID%>', is_assoc ? (net.bssid || '-') : null,
'<%:Encryption%>', is_assoc ? net.encryption : null,
- '<%:Associations%>', is_assoc ? (num_assoc || '-') : null,
+ '<%:Associations%>', is_assoc ? (net.num_assoc || '-') : null,
null, is_assoc ? null : E('em', '<%:Wireless is disabled or not associated%>')));
}
@@ -481,62 +338,6 @@
if (!ws.lastElementChild)
ws.appendChild(E('
<%:No information available%>'));
}
-
- var ac = document.getElementById('wifi_assoc_table');
- if (ac)
- {
- /* clear all rows */
- while (ac.firstElementChild !== ac.lastElementChild)
- ac.removeChild(ac.lastElementChild);
-
- assoclist.sort(function(a, b) {
- return (a.name == b.name)
- ? (a.bssid < b.bssid)
- : (a.name > b.name )
- ;
- });
-
- for (var i = 0; i < assoclist.length; i++)
- {
- var icon;
- var q = (-1 * (assoclist[i].noise - assoclist[i].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";
-
- var host = hosts[assoclist[i].bssid],
- name = host ? (host.name || host.ipv4 || host.ipv6) : null,
- hint = (host && host.name && (host.ipv4 || host.ipv6)) ? (host.ipv4 || host.ipv6) : null;
-
- ac.appendChild(E('
'.format(1 + (i % 2)), [
- E('
%h'
- .format(assoclist[i].radio, assoclist[i].ifname)),
- E('
'
- .format(assoclist[i].link, assoclist[i].name)),
- E('
',
- assoclist[i].bssid),
- E('
',
- hint ? '
%h (%h)
'.format(name || '?', hint) : (name || '?')),
- E('
%d / %d <%:dBm%> '
- .format(assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise, icon, assoclist[i].signal, assoclist[i].noise)),
- E('
', [
- E('
', wifirate(assoclist[i], true)),
- E('
'),
- E('', wifirate(assoclist[i], false))
- ])
- ]));
- }
-
- if (ac.firstElementChild === ac.lastElementChild)
- ac.appendChild(E('
<%:No information available%>
<%:Status%>
-
<% end %>
<% if has_wifi then %>
-
