Deduplication in meshctrl netif2
Noah Zalev committed
Jul 12, 2021 at 18:08 UTC
f98e5fcefba395bb2b85356a3de0c721aeef056f
1 file changed
+4
-16
meshctrl.js
+4
-16
@@ -2349,8 +2349,7 @@ function displayDeviceInfo(sysinfo, lastconnect, network, nodes) {
2349
)
2350
continue;
2351
2352
- var ifTitle = '';
2353
- if (i != null) ifTitle += i;
2352
+ var ifTitle = '' + i;
2353
if (m[0].fqdn != null && m[0].fqdn != '') ifTitle += ', ' + m[0].fqdn;
2354
2355
if (typeof m[0].mac == 'string') {
@@ -2366,24 +2365,13 @@ function displayDeviceInfo(sysinfo, lastconnect, network, nodes) {
2365
moutput['IPv6 Layer'] = '';
2366
for (var j = 0; j < m.length; j++) {
2367
var iplayer = m[j];
2369
- if (iplayer.family == 'IPv4') {
2368
+ if (iplayer.family == 'IPv4' || iplayer.family == 'IPv6') {
2369
if (iplayer.gateway && iplayer.netmask) {
2371
- moutput['IPv4 Layer'] += format("IP: {0}, Mask: {1}, Gateway: {2} ", iplayer.address, iplayer.netmask, iplayer.gateway);
2370
+ moutput[iplayer.family + ' Layer'] += format("IP: {0}, Mask: {1}, Gateway: {2} ", iplayer.address, iplayer.netmask, iplayer.gateway);
2371
moutputCount++;
2372
} else {
2373
if (iplayer.address) {
2375
- moutput['IPv4 Layer'] += format("IP: {0} ", iplayer.address);
2376
- moutputCount++;
2377
- }
2378
- }
2379
- }
2380
- if (iplayer.family == 'IPv6') {
2381
- if (iplayer.gateway && iplayer.netmask) {
2382
- moutput['IPv6 Layer'] += format("IP: {0}, Mask: {1}, Gateway: {2} ", iplayer.address, iplayer.netmask, iplayer.gateway);
2383
- moutputCount++;
2384
- } else {
2385
- if (iplayer.address) {
2386
- moutput['IPv6 Layer'] += format("IP: {0} ", iplayer.address);
2374
+ moutput[iplayer.family + ' Layer'] += format("IP: {0} ", iplayer.address);
2375
moutputCount++;
2376
}
2377
}