+
+
@@ -1632,7 +1632,7 @@
if (updateNaggleFlags & 1) { onSearchInputChanged(); }
if (updateNaggleFlags & 2) { onSortSelectChange(false); }
if (updateNaggleFlags & 128) { updateMeshes(); }
- if (updateNaggleFlags & 4) { updateDevices(); if (xxcurrentView == 21) { p21updateMesh(); } }
+ if (updateNaggleFlags & 4) { updateDevices(); updateDeviceDetails(); if (xxcurrentView == 21) { p21updateMesh(); } }
if (updateNaggleFlags & 8) { drawNotifications(); }
{{{StartGeoLocationJS}}}if (updateNaggleFlags & 16) { updateMapMarkers(); }{{{EndGeoLocationJS}}}
if (updateNaggleFlags & 32) { eventsUpdate(); }
@@ -1831,67 +1831,9 @@
if (message.nodeid != powerTimelineReq) break;
//console.log('getsysinfo', message); // ***********************
if (message.noinfo === true) {
- QH('p17info', "No information for this device.");
+ updateDeviceDetails(getNodeFromId(message.nodeid));
} else {
- var x = '', s = {};
- if (message.hardware) {
- if (message.hardware.identifiers) {
- var ident = message.hardware.identifiers;
- // BIOS
- x += '
'; - - // Motherboard - x += '
'; - } - - if (message.hardware.windows) { - if (message.hardware.windows.memory) { - // Memory - x += '';
- for (var i in message.hardware.windows.memory) {
- var m = message.hardware.windows.memory[i];
- x += '
'; - } - - if (message.hardware.windows.osinfo) { - // Operating System - var m = message.hardware.windows.osinfo; - x += '
'; - } - - // Disks - //x += '
'; - } - } - - QH('p17info', x); + updateDeviceDetails(getNodeFromId(message.nodeid), message.hardware); } break; } @@ -1963,7 +1905,9 @@ break; } case 'getnetworkinfo': { - if ((currentNode._id == message.nodeid) && (xxdialogMode == 2) && (xxdialogTag == 'if' + message.nodeid)) { + if (currentNode._id != message.nodeid) return; + updateDeviceDetails(getNodeFromId(message.nodeid), null, message); + if ((xxdialogMode == 2) && (xxdialogTag == 'if' + message.nodeid)) { if (message.netif == null) { QH('d2netinfo', "No network interface information available for this device."); } else { @@ -5058,6 +5002,7 @@ meshserver.send({ action: 'powertimeline', nodeid: currentNode._id }); meshserver.send({ action: 'lastconnect', nodeid: currentNode._id }); meshserver.send({ action: 'getsysinfo', nodeid: currentNode._id }); + meshserver.send({ action: 'getnetworkinfo', nodeid: currentNode._id }); QH('p17info', ''); } @@ -7347,6 +7292,177 @@ } } + // + // DEVICE DETAILS + // + + var DeviceDetailsHardware = null; + var DeviceDetailsNetwork = null; + var DeviceDetailsNodeId = null; + function updateDeviceDetails(node, hardware, network) { + if (currentNode == null) return; + if (node == null) { node = currentNode; } + if (currentNode._id != node._id) return; + if (DeviceDetailsNodeId != node._id) { DeviceDetailsHardware = null; DeviceDetailsNetwork = null; DeviceDetailsNodeId = node._id; } + if (hardware != null) { DeviceDetailsHardware = hardware; } + if (network != null) { DeviceDetailsNetwork = network; } + hardware = DeviceDetailsHardware; + network = DeviceDetailsNetwork; + if (hardware == null) { hardware = {}; } + if (network == null) { network = {}; } + var sections = [], s = {}; + + // Operating System + if ((hardware.windows && hardware.windows.osinfo) || node.osdesc) { + var x = ''; + if (node.rname) { x += addDetailItem("Name", EscapeHtml(node.rname), s); } + if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); } + if (hardware.windows && hardware.windows.osinfo) { + var m = hardware.windows.osinfo; + if (m.OSArchitecture) { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); } + } + if (x != '') { sections.push({ name: "Operating System", html: x, img: 'software64.png'}); } + } + + // MeshAgent + if (node.agent) { + var x = ''; + if ((node.agent != null) && (node.agent.id != null) && (node.agent.ver != null)) { + var str = ''; + if (node.agent.id <= agentsStr.length) { str = agentsStr[node.agent.id]; } else { str = agentsStr[0]; } + if (node.agent.ver != 0) { str += ' v' + node.agent.ver; } + x += addDetailItem("Mesh Agent", str); + } + if ((node.conn & 1) != 0) { + x += addDetailItem("Last agent connection", "Connected now"); + } else { + if (node.lastconnect) { x += addDetailItem("Last agent connection", printDateTime(new Date(node.lastconnect))); } + } + if (node.lastaddr) { + var splitip = node.lastaddr.split(':'); + if (splitip.length > 2) { + // IPv6 + x += addDetailItem("Last agent address", node.lastaddr); + } else { + // IPv4 + if (isPrivateIP(node.lastaddr)) { + x += addDetailItem("Last agent address", splitip[0]); + } else { + x += addDetailItem("Last agent address", '' + splitip[0] + ''); + } + } + } + if (x != '') { sections.push({ name: "Mesh Agent", html: x, img: 'meshagent64.png'}); } + } + + // Networking + if (network.netif != null) { + var x = ''; + x += '';
+ for (var i in network.netif) {
+ var m = network.netif[i];
+ x += '
';
+ if (x != '') { sections.push({ name: "Networking", html: x, img: 'networking64.png'}); }
+ }
+
+ // Attribute: Intel AMT
+ if (node.intelamt != null) {
+ var x = '';
+ x += addDetailItem("Version", (node.intelamt.ver)?('v' + node.intelamt.ver):('' + "Unknown" + ''), s);
+ var provisioningStates = { 0: nobreak("Not Activated (Pre)"), 1: nobreak("Not Activated (In)"), 2: nobreak("Activated") };
+ var provisioningMode = '';
+ if ((node.intelamt.state == 2) && node.intelamt.flags) { if (node.intelamt.flags & 2) { provisioningMode = (', ' + "Client Control Mode (CCM)"); } else if (node.intelamt.flags & 4) { provisioningMode = (', ' + "Admin Control Mode (ACM)"); } }
+ x += addDetailItem("Provisioning State", ((node.intelamt.state)?(provisioningStates[node.intelamt.state]):('' + "Unknown" + '')) + provisioningMode, s);
+ x += addDetailItem("Security", (node.intelamt.tls == 1)?"Secured using TLS":"TLS is not setup", s);
+ x += addDetailItem("Admin Credentials", (node.intelamt.user == null || node.intelamt.user == '')?"Not Known":"Known", s);
+ if (x != '') { sections.push({ name: "Intel® Active Management Technology (Intel® AMT)", html: x, img: 'amt64.png' }); }
+ }
+
+ if (hardware.identifiers) {
+ var x = '', ident = hardware.identifiers;
+ // BIOS
+ if (ident.bios_vendor) { x += addDetailItem("Vendor", EscapeHtml(ident.bios_vendor), s); }
+ if (ident.bios_version) { x += addDetailItem("Version", EscapeHtml(ident.bios_version), s); }
+ if (x != '') { sections.push({ name: "BIOS", html: x, img: 'chip64.png' }); }
+
+ // Motherboard
+ x = '';
+ if (ident.board_vendor) { x += addDetailItem("Vendor", EscapeHtml(ident.board_vendor), s); }
+ if (ident.board_name) { x += addDetailItem("Name", EscapeHtml(ident.board_name), s); }
+ if (ident.board_serial && (ident.board_serial != '')) { x += addDetailItem("Serial", EscapeHtml(ident.board_serial), s); }
+ if (ident.board_version) { x += addDetailItem("Version", EscapeHtml(ident.board_version), s); }
+ if (ident.product_uuid) { x += addDetailItem("Identifier", EscapeHtml(ident.product_uuid), s); }
+ if (x != '') { sections.push({ name: "Motherboard", html: x, img: 'motherboard64.png'}); }
+ }
+
+ if (hardware.windows) {
+ if (hardware.windows.memory) {
+ var x = '';
+ // Sort Memory
+ function memorySort(a, b) { if (a.BankLabel > b.BankLabel) return 1; if (a.BankLabel < b.BankLabel) return -1; return 0; }
+ hardware.windows.memory.sort(memorySort);
+
+ x += '';
+ for (var i in hardware.windows.memory) {
+ var m = hardware.windows.memory[i];
+ x += '
';
+
+ if (x != '') { sections.push({ name: "Memory", html: x, img: 'ram64.png'}); }
+ }
+
+ // Disks
+ //x += '
'; + //console.log(message); + } + + // Render the sections + var x = ''; + for (var i in sections) { + if (sections[i].img == null) { + x += '
';
+ }
+ }
+
+ if (x == '') {
+ QH('p17info', "No information for this device.");
+ } else {
+ QH('p17info', x);
+ }
+ }
+
//
// CONSOLE
//
@@ -11120,7 +11236,7 @@
function printDate(d) { return d.toLocaleDateString(args.locale); }
function printTime(d) { return d.toLocaleTimeString(args.locale); }
function printDateTime(d) { return d.toLocaleString(args.locale); }
- function addDetailItem(title, value, state) { return '
'; }
function format(format) { var args = Array.prototype.slice.call(arguments, 1); return format.replace(/{(\d+)}/g, function (match, number) { return typeof args[number] != 'undefined' ? args[number] : match; }); };
function addTextLink(subtext, text, link) { var i = text.toLowerCase().indexOf(subtext.toLowerCase()); if (i == -1) { return text; } return text.substring(0, i) + '' + subtext + '' + text.substring(i + subtext.length); }
function nobreak(x) { return x.split(' ').join(' '); }
Details -
' + "BIOS" + '
';
- if (ident.bios_vendor) { x += addDetailItem("Vendor", ident.bios_vendor, s); }
- if (ident.bios_version) { x += addDetailItem("Version", ident.bios_version, s); }
- x += ''; - - // Motherboard - x += '
' + "Motherboard" + '
';
- if (ident.board_vendor) { x += addDetailItem("Vendor", ident.board_vendor, s); }
- if (ident.board_name) { x += addDetailItem("Name", ident.board_name, s); }
- if (ident.board_serial && (ident.board_serial != '')) { x += addDetailItem("Serial", ident.board_serial, s); }
- if (ident.board_version) { x += addDetailItem("Version", ident.board_version, s); }
- if (ident.product_uuid) { x += addDetailItem("Identifier", ident.product_uuid, s); }
- x += ''; - } - - if (message.hardware.windows) { - if (message.hardware.windows.memory) { - // Memory - x += '
' + "Memory" + '
';
-
- // Sort Memory
- function memorySort(a, b) { if (a.BankLabel > b.BankLabel) return 1; if (a.BankLabel < b.BankLabel) return -1; return 0; }
- message.hardware.windows.memory.sort(memorySort);
-
- x += ' '
- x += ' | ';
- x += ' ';
- }
- x += '' + m.BankLabel + ' ';
- if (m.Capacity) { x += addDetailItem("Capacity / Speed", format("{0} Mb, {1} Mhz", (m.Capacity / 1024 / 1024), m.Speed), s); }
- if (m.PartNumber) { x += addDetailItem("Part Number", ((m.Manufacturer && m.Manufacturer != 'Undefined')?(m.Manufacturer + ', '):'') + m.PartNumber, s); }
- x += ' |
'; - } - - if (message.hardware.windows.osinfo) { - // Operating System - var m = message.hardware.windows.osinfo; - x += '
' + "Operating System" + '
';
- if (m.Caption) { x += addDetailItem("Name", m.Caption, s); }
- if (m.Version) { x += addDetailItem("Version", m.Version, s); }
- if (m.OSArchitecture) { x += addDetailItem("Architecture", m.OSArchitecture, s); }
- x += ''; - } - - // Disks - //x += '
Disks
';
- //x += ''; - } - } - - QH('p17info', x); + updateDeviceDetails(getNodeFromId(message.nodeid), message.hardware); } break; } @@ -1963,7 +1905,9 @@ break; } case 'getnetworkinfo': { - if ((currentNode._id == message.nodeid) && (xxdialogMode == 2) && (xxdialogTag == 'if' + message.nodeid)) { + if (currentNode._id != message.nodeid) return; + updateDeviceDetails(getNodeFromId(message.nodeid), null, message); + if ((xxdialogMode == 2) && (xxdialogTag == 'if' + message.nodeid)) { if (message.netif == null) { QH('d2netinfo', "No network interface information available for this device."); } else { @@ -5058,6 +5002,7 @@ meshserver.send({ action: 'powertimeline', nodeid: currentNode._id }); meshserver.send({ action: 'lastconnect', nodeid: currentNode._id }); meshserver.send({ action: 'getsysinfo', nodeid: currentNode._id }); + meshserver.send({ action: 'getnetworkinfo', nodeid: currentNode._id }); QH('p17info', ''); } @@ -7347,6 +7292,177 @@ } } + // + // DEVICE DETAILS + // + + var DeviceDetailsHardware = null; + var DeviceDetailsNetwork = null; + var DeviceDetailsNodeId = null; + function updateDeviceDetails(node, hardware, network) { + if (currentNode == null) return; + if (node == null) { node = currentNode; } + if (currentNode._id != node._id) return; + if (DeviceDetailsNodeId != node._id) { DeviceDetailsHardware = null; DeviceDetailsNetwork = null; DeviceDetailsNodeId = node._id; } + if (hardware != null) { DeviceDetailsHardware = hardware; } + if (network != null) { DeviceDetailsNetwork = network; } + hardware = DeviceDetailsHardware; + network = DeviceDetailsNetwork; + if (hardware == null) { hardware = {}; } + if (network == null) { network = {}; } + var sections = [], s = {}; + + // Operating System + if ((hardware.windows && hardware.windows.osinfo) || node.osdesc) { + var x = ''; + if (node.rname) { x += addDetailItem("Name", EscapeHtml(node.rname), s); } + if (node.osdesc) { x += addDetailItem("Version", EscapeHtml(node.osdesc), s); } + if (hardware.windows && hardware.windows.osinfo) { + var m = hardware.windows.osinfo; + if (m.OSArchitecture) { x += addDetailItem("Architecture", EscapeHtml(m.OSArchitecture), s); } + } + if (x != '') { sections.push({ name: "Operating System", html: x, img: 'software64.png'}); } + } + + // MeshAgent + if (node.agent) { + var x = ''; + if ((node.agent != null) && (node.agent.id != null) && (node.agent.ver != null)) { + var str = ''; + if (node.agent.id <= agentsStr.length) { str = agentsStr[node.agent.id]; } else { str = agentsStr[0]; } + if (node.agent.ver != 0) { str += ' v' + node.agent.ver; } + x += addDetailItem("Mesh Agent", str); + } + if ((node.conn & 1) != 0) { + x += addDetailItem("Last agent connection", "Connected now"); + } else { + if (node.lastconnect) { x += addDetailItem("Last agent connection", printDateTime(new Date(node.lastconnect))); } + } + if (node.lastaddr) { + var splitip = node.lastaddr.split(':'); + if (splitip.length > 2) { + // IPv6 + x += addDetailItem("Last agent address", node.lastaddr); + } else { + // IPv4 + if (isPrivateIP(node.lastaddr)) { + x += addDetailItem("Last agent address", splitip[0]); + } else { + x += addDetailItem("Last agent address", '' + splitip[0] + ''); + } + } + } + if (x != '') { sections.push({ name: "Mesh Agent", html: x, img: 'meshagent64.png'}); } + } + + // Networking + if (network.netif != null) { + var x = ''; + x += '
';
+ x += ' ';
+ }
+ x += '' + EscapeHtml(m.name + (m.dnssuffix?(', ' + m.dnssuffix):'')) + ' ';
+ if (m.desc) { x += addDetailItem("Description", EscapeHtml(m.desc).split('(R)').join('®')); }
+ //if (m.dnssuffix) { x += addDetailItem("DNS Suffix", m.dnssuffix); }
+ if (m.mac) {
+ if (m.gatewaymac) {
+ x += addDetailItem("MAC Layer", format("MAC: {0}, Gateway: {1}", EscapeHtml(m.mac), EscapeHtml(m.gatewaymac)));
+ } else {
+ x += addDetailItem("MAC Layer", format("MAC: {0}", m.mac));
+ }
+ }
+ if (m.v4addr && (m.v4addr != '0.0.0.0')) {
+ if (m.v4gateway && m.v4mask) {
+ x += addDetailItem("IPv4 Layer", format("IP: {0}, Mask: {1}, Gateway: {2}", EscapeHtml(m.v4addr), EscapeHtml(m.v4mask), EscapeHtml(m.v4gateway)));
+ } else {
+ x += addDetailItem("IPv4 Layer", format("IP: {0}", EscapeHtml(m.v4addr)));
+ }
+ }
+ x += ' |
| '
+ x += ' | ';
+ x += ' ';
+ }
+ x += '' + EscapeHtml(m.BankLabel) + ' ';
+ if (m.Capacity) { x += addDetailItem("Capacity / Speed", format("{0} Mb, {1} Mhz", (m.Capacity / 1024 / 1024), m.Speed), s); }
+ if (m.PartNumber) { x += addDetailItem("Part Number", EscapeHtml((m.Manufacturer && m.Manufacturer != 'Undefined')?(m.Manufacturer + ', '):'') + EscapeHtml(m.PartNumber), s); }
+ x += ' |
Disks
';
+ //x += ''; + //console.log(message); + } + + // Render the sections + var x = ''; + for (var i in sections) { + if (sections[i].img == null) { + x += '
' + sections[i].name + '
' + sections[i].html + '
';
+ } else {
+ x += '' + sections[i].name + ' ' + sections[i].html + ' | ';
+ x += '
' + value + '' + title + '
'; }
+ function addDetailItem(title, value, state) { return '| ' + nobreak(title) + ' | ' + value + ' |