X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fview%2Fadmin_status%2Findex.htm;h=d29a89427687738fca1b2493134ac8c01ecc8f9f;hp=17dfd14666140a7a7cb64a65dbf361ac0664fdfe;hb=7ae244a26ef516511a5e476dd14ec033501a1d8d;hpb=b7f80a98d8b78e259648d820912b7c2338529e0a diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm index 17dfd1466..d29a89427 100644 --- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm +++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm @@ -1,20 +1,14 @@ <%# -LuCI - Lua Configuration Interface -Copyright 2008 Steven Barth -Copyright 2008-2011 Jo-Philipp Wich - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - + Copyright 2008 Steven Barth + Copyright 2008-2011 Jo-Philipp Wich + Licensed to the public under the Apache License 2.0. -%> <% local fs = require "nixio.fs" local util = require "luci.util" local stat = require "luci.tools.status" + local ver = require "luci.version" local has_ipv6 = fs.access("/proc/net/ipv6_route") local has_dhcp = fs.access("/etc/config/dhcp") @@ -22,6 +16,7 @@ You may obtain a copy of the License at local sysinfo = luci.util.ubus("system", "info") or { } local boardinfo = luci.util.ubus("system", "board") or { } + local unameinfo = nixio.uname() or { } local meminfo = sysinfo.memory or { total = 0, @@ -42,10 +37,8 @@ You may obtain a copy of the License at local wan = ntm:get_wannet() local wan6 = ntm:get_wan6net() - local conn_count = tonumber(( - luci.sys.exec("wc -l /proc/net/nf_conntrack") or - luci.sys.exec("wc -l /proc/net/ip_conntrack") or - ""):match("%d+")) or 0 + local conn_count = tonumber( + fs.readfile("/proc/sys/net/netfilter/nf_conntrack_count")) or 0 local conn_max = tonumber(( luci.sys.exec("sysctl net.nf_conntrack_max") or @@ -54,7 +47,7 @@ You may obtain a copy of the License at local rv = { uptime = sysinfo.uptime or 0, - localtime = sysinfo.localtime or 0, + localtime = os.date(), loadavg = sysinfo.load or { 0, 0, 0 }, memory = meminfo, swap = swapinfo, @@ -81,25 +74,34 @@ You may obtain a copy of the License at if wan6 then rv.wan6 = { - ip6addr = wan6:ip6addr(), - gw6addr = wan6:gw6addr(), - dns = wan6:dns6addrs(), - uptime = wan6:uptime(), - ifname = wan6:ifname(), - link = wan6:adminlink() + ip6addr = wan6:ip6addr(), + gw6addr = wan6:gw6addr(), + dns = wan6:dns6addrs(), + ip6prefix = wan6:ip6prefix(), + uptime = wan6:uptime(), + proto = wan6:proto(), + ifname = wan6:ifname(), + link = wan6:adminlink() } end if has_dsl then local dsl_stat = luci.sys.exec("/etc/init.d/dsl_control lucistat") local dsl_func = loadstring(dsl_stat) - rv.dsl = dsl_func() + if dsl_func then + rv.dsl = dsl_func() + end end 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 -%> @@ -124,12 +126,51 @@ You may obtain a copy of the License at ); } - var wifidevs = <%=luci.http.write_json(netdevs)%>; - var arptable = <%=luci.http.write_json(arpcache)%>; + 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 === 24 && 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; + }); + } XHR.poll(5, '<%=REQUEST_URI%>', { status: 1 }, function(x, info) { + if (!(npoll++ % 5)) + updateHosts(); + var si = document.getElementById('wan4_i'); var ss = document.getElementById('wan4_s'); var ifc = info.wan; @@ -192,9 +233,34 @@ You may obtain a copy of the License at if (ifc6 && ifc6.ifname && ifc6.proto != 'none') { var s = String.format( - '<%:Address%>: %s
' + + '<%:Type%>: %s%s
', + ifc6.proto, (ifc6.ip6prefix) ? '-pd' : '' + ); + + if (!ifc6.ip6prefix) + { + s += String.format( + '<%:Address%>: %s
', + (ifc6.ip6addr) ? ifc6.ip6addr : '::' + ); + } + else + { + s += String.format( + '<%:Prefix Delegated%>: %s
', + ifc6.ip6prefix + ); + if (ifc6.ip6addr) + { + s += String.format( + '<%:Address%>: %s
', + ifc6.ip6addr + ); + } + } + + s += String.format( '<%:Gateway%>: %s
', - (ifc6.ip6addr) ? ifc6.ip6addr : '::', (ifc6.gw6addr) ? ifc6.gw6addr : '::' ); @@ -235,20 +301,56 @@ You may obtain a copy of the License at var s = String.format( '<%:Status%>: %s
' + '<%:Line State%>: %s [0x%x]
' + - '<%:Line Speed%>: %s/s / %s/s
' + - '<%:Line Attenuation%>: %s dB / %s dB
' + - '<%:Noise Margin%>: %s dB / %s dB
', + '<%:Line Mode%>: %s
' + + '<%:Annex%>: %s
' + + '<%:Profile%>: %s
' + + '<%:Data Rate%>: %s/s / %s/s
' + + '<%:Max. Attainable Data Rate (ATTNDR)%>: %s/s / %s/s
' + + '<%:Latency%>: %s / %s
' + + '<%:Line Attenuation (LATN)%>: %s dB / %s dB
' + + '<%:Signal Attenuation (SATN)%>: %s dB / %s dB
' + + '<%:Noise Margin (SNR)%>: %s dB / %s dB
' + + '<%:Aggregate Transmit Power(ACTATP)%>: %s dB / %s dB
' + + '<%:Forward Error Correction Seconds (FECS)%>: %s / %s
' + + '<%:Errored seconds (ES)%>: %s / %s
' + + '<%:Severely Errored Seconds (SES)%>: %s / %s
' + + '<%:Loss of Signal Seconds (LOSS)%>: %s / %s
' + + '<%:Unavailable Seconds (UAS)%>: %s / %s
' + + '<%:Header Error Code Errors (HEC)%>: %s / %s
' + + '<%:Non Pre-emtive CRC errors (CRC_P)%>: %s / %s
' + + '<%:Pre-emtive CRC errors (CRCP_P)%>: %s / %s
' + + '<%:Line Uptime%>: %s
' + + '<%:ATU-C System Vendor ID%>: %s
' + + '<%:Power Management Mode%>: %s
', info.dsl.line_state, info.dsl.line_state_detail, info.dsl.line_state_num, + info.dsl.line_mode_s, + info.dsl.annex_s, + info.dsl.profile_s, info.dsl.data_rate_down_s, info.dsl.data_rate_up_s, + info.dsl.max_data_rate_down_s, info.dsl.max_data_rate_up_s, + info.dsl.latency_num_down, info.dsl.latency_num_up, info.dsl.line_attenuation_down, info.dsl.line_attenuation_up, - info.dsl.noise_margin_down, info.dsl.noise_margin_up + info.dsl.signal_attenuation_down, info.dsl.signal_attenuation_up, + info.dsl.noise_margin_down, info.dsl.noise_margin_up, + info.dsl.actatp_down, info.dsl.actatp_up, + info.dsl.errors_fec_near, info.dsl.errors_fec_far, + info.dsl.errors_es_near, info.dsl.errors_es_far, + info.dsl.errors_ses_near, info.dsl.errors_ses_far, + info.dsl.errors_loss_near, info.dsl.errors_loss_far, + info.dsl.errors_uas_near, info.dsl.errors_uas_far, + info.dsl.errors_hec_near, info.dsl.errors_hec_far, + info.dsl.errors_crc_p_near, info.dsl.errors_crc_p_far, + info.dsl.errors_crcp_p_near, info.dsl.errors_crcp_p_far, + info.dsl.line_uptime_s, + info.dsl.atuc_vendor_id, + info.dsl.power_mode_s ); dsl_s.innerHTML = String.format('%s', s); dsl_i.innerHTML = String.format( '' + - '
ADSL' + '
DSL' ); <% end %> @@ -264,7 +366,9 @@ You may obtain a copy of the License at { var timestr; - if (info.leases[i].expires <= 0) + 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); @@ -302,7 +406,9 @@ You may obtain a copy of the License at { var timestr; - if (info.leases6[i].expires <= 0) + 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); @@ -310,7 +416,17 @@ You may obtain a copy of the License at var tr = ls6.rows[0].parentNode.insertRow(-1); tr.className = 'cbi-section-table-row cbi-rowstyle-' + ((i % 2) + 1); - tr.insertCell(-1).innerHTML = info.leases6[i].hostname ? info.leases6[i].hostname : '?'; + var host = hosts[duid2mac(info.leases6[i].duid)]; + if (host) + tr.insertCell(-1).innerHTML = String.format( + '
%s
', + ((host.name && (host.ipv4 || host.ipv6)) + ? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6) + : '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr() + ); + else + tr.insertCell(-1).innerHTML = info.leases6[i].hostname ? info.leases6[i].hostname : '?'; + tr.insertCell(-1).innerHTML = info.leases6[i].ip6addr; tr.insertCell(-1).innerHTML = info.leases6[i].duid; tr.insertCell(-1).innerHTML = timestr; @@ -357,7 +473,7 @@ You may obtain a copy of the License at for (var nidx = 0; nidx < dev.networks.length; nidx++) { var net = dev.networks[nidx]; - var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel); + var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled); var icon; if (!is_assoc) @@ -384,7 +500,7 @@ You may obtain a copy of the License at '<%:Bitrate%>: %s <%:Mbit/s%>
', icon, net.signal, net.noise, net.quality, - net.link, net.ssid, + net.link, net.ssid || '?', net.mode, net.channel, net.frequency, net.bitrate || '?' @@ -395,7 +511,7 @@ You may obtain a copy of the License at s += String.format( '<%:BSSID%>: %s
' + '<%:Encryption%>: %s', - net.bssid, + net.bssid || '?', net.encryption ); } @@ -408,19 +524,15 @@ You may obtain a copy of the License at for (var bssid in net.assoclist) { - assoclist.push({ - bssid: bssid, - signal: net.assoclist[bssid].signal, - noise: net.assoclist[bssid].noise, - rx_rate: net.assoclist[bssid].rx_rate, - rx_mcs: net.assoclist[bssid].rx_mcs, - rx_40mhz: net.assoclist[bssid].rx_40mhz, - tx_rate: net.assoclist[bssid].tx_rate, - tx_mcs: net.assoclist[bssid].tx_mcs, - tx_40mhz: net.assoclist[bssid].tx_40mhz, - link: net.link, - name: net.name - }); + 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); } } @@ -464,30 +576,37 @@ You may obtain a copy of the License at icon = "<%=resource%>/icons/signal-75-100.png"; tr.insertCell(-1).innerHTML = String.format( - '', - icon, assoclist[i].signal, assoclist[i].noise + ' %h', + assoclist[i].radio, assoclist[i].ifname ); - tr.insertCell(-1).innerHTML = assoclist[i].bssid; - tr.insertCell(-1).innerHTML = String.format( '%s', assoclist[i].link, '%h'.format(assoclist[i].name).nobr() ); - tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].signal).nobr(); - tr.insertCell(-1).innerHTML = String.format('%d <%:dBm%>', assoclist[i].noise).nobr(); + tr.insertCell(-1).innerHTML = assoclist[i].bssid; - tr.insertCell(-1).innerHTML = (assoclist[i].rx_mcs > -1) - ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].rx_rate / 1000, assoclist[i].rx_mcs, assoclist[i].rx_40mhz ? 40 : 20).nobr() - : String.format('%.1f <%:Mbit/s%>', assoclist[i].rx_rate / 1000).nobr() - ; + var host = hosts[assoclist[i].bssid]; + if (host) + tr.insertCell(-1).innerHTML = String.format( + '
%s
', + ((host.name && (host.ipv4 || host.ipv6)) + ? '%h (%s)'.format(host.name, host.ipv4 || host.ipv6) + : '%h'.format(host.name || host.ipv4 || host.ipv6)).nobr() + ); + else + tr.insertCell(-1).innerHTML = '?'; - tr.insertCell(-1).innerHTML = (assoclist[i].tx_mcs > -1) - ? String.format('%.1f <%:Mbit/s%>, MCS %d, %d<%:MHz%>', assoclist[i].tx_rate / 1000, assoclist[i].tx_mcs, assoclist[i].tx_40mhz ? 40 : 20).nobr() - : String.format('%.1f <%:Mbit/s%>', assoclist[i].tx_rate / 1000).nobr() - ; + tr.insertCell(-1).innerHTML = String.format( + ' %d / %d <%:dBm%>', + assoclist[i].signal, assoclist[i].noise, assoclist[i].signal - assoclist[i].noise, + icon, + assoclist[i].signal, assoclist[i].noise + ); + + tr.insertCell(-1).innerHTML = wifirate(assoclist[i], true).nobr() + '
' + wifirate(assoclist[i], false).nobr(); } if (ac.rows.length == 1) @@ -505,7 +624,7 @@ You may obtain a copy of the License at var e; if (e = document.getElementById('localtime')) - e.innerHTML = (new Date(info.localtime * 1000)).toUTCString(); + e.innerHTML = info.localtime; if (e = document.getElementById('uptime')) e.innerHTML = String.format('%t', info.uptime); @@ -555,7 +674,7 @@ You may obtain a copy of the License at ); //]]> -

<%:Status%>

+

<%:Status%>

<%:System%> @@ -564,10 +683,10 @@ You may obtain a copy of the License at <%:Hostname%><%=luci.sys.hostname() or "?"%> <%:Model%><%=pcdata(boardinfo.model or boardinfo.system or "?")%> <%:Firmware Version%> - <%=pcdata(luci.version.distname)%> <%=pcdata(luci.version.distversion)%> / - <%=pcdata(luci.version.luciname)%> (<%=pcdata(luci.version.luciversion)%>) + <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> / + <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>) - <%:Kernel Version%><%=luci.sys.exec("uname -r")%> + <%:Kernel Version%><%=unameinfo.release or "?"%> <%:Local Time%>- <%:Uptime%>- <%:Load Average%>- @@ -639,7 +758,7 @@ You may obtain a copy of the License at - + @@ -653,9 +772,9 @@ You may obtain a copy of the License at <% if has_dsl then %>
- <%:ADSL%> + <%:DSL%>
<%:Hostname%><%:Host%> <%:IPv6-Address%> <%:DUID%> <%:Leasetime remaining%>
-
<%:ADSL Status%> +
<%:DSL Status%> @@ -677,18 +796,17 @@ You may obtain a copy of the License at
<%:Associated Stations%> -

?		 <%:Collecting data...%>
+
- - - - - + + + + - +
 <%:MAC-Address%> <%:Network%><%:Signal%><%:Noise%><%:RX Rate%><%:TX Rate%><%:MAC-Address%><%:Host%><%:Signal%> / <%:Noise%><%:RX Rate%> / <%:TX Rate%>

<%:Collecting data...%>
<%:Collecting data...%>