Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-09 12:46:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Deduplication in meshctrl netif2

Browse Source
This commit is contained in:
Noah Zalev 2021-07-12 18:08:30 -04:00
parent 3e0fb41524
commit f98e5fcefb
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meshctrl.js
View File

@ -2349,8 +2349,7 @@ function displayDeviceInfo(sysinfo, lastconnect, network, nodes) {
) )
continue; continue;
var ifTitle = ''; var ifTitle = '' + i;
if (i != null) ifTitle += i;
if (m[0].fqdn != null && m[0].fqdn != '') ifTitle += ', ' + m[0].fqdn; if (m[0].fqdn != null && m[0].fqdn != '') ifTitle += ', ' + m[0].fqdn;
if (typeof m[0].mac == 'string') { if (typeof m[0].mac == 'string') {
@ -2366,24 +2365,13 @@ function displayDeviceInfo(sysinfo, lastconnect, network, nodes) {
moutput['IPv6 Layer'] = ''; moutput['IPv6 Layer'] = '';
for (var j = 0; j < m.length; j++) { for (var j = 0; j < m.length; j++) {
var iplayer = m[j]; var iplayer = m[j];
if (iplayer.family == 'IPv4') { if (iplayer.family == 'IPv4' || iplayer.family == 'IPv6') {
if (iplayer.gateway && iplayer.netmask) { if (iplayer.gateway && iplayer.netmask) {
moutput['IPv4 Layer'] += format("IP: {0}, Mask: {1}, Gateway: {2} ", iplayer.address, iplayer.netmask, iplayer.gateway); moutput[iplayer.family + ' Layer'] += format("IP: {0}, Mask: {1}, Gateway: {2} ", iplayer.address, iplayer.netmask, iplayer.gateway);
moutputCount++; moutputCount++;
} else { } else {
if (iplayer.address) { if (iplayer.address) {
moutput['IPv4 Layer'] += format("IP: {0} ", iplayer.address); moutput[iplayer.family + ' Layer'] += format("IP: {0} ", iplayer.address);
moutputCount++;
}
}
}
if (iplayer.family == 'IPv6') {
if (iplayer.gateway && iplayer.netmask) {
moutput['IPv6 Layer'] += format("IP: {0}, Mask: {1}, Gateway: {2} ", iplayer.address, iplayer.netmask, iplayer.gateway);
moutputCount++;
} else {
if (iplayer.address) {
moutput['IPv6 Layer'] += format("IP: {0} ", iplayer.address);
moutputCount++; moutputCount++;
} }
} }