networkInterfaces() added subnet mask ip4 and ip6

This commit is contained in:
Sebastian Hildebrandt
2020-05-01 20:21:23 +02:00
parent 0495740a32
commit 4c6b6a257a
9 changed files with 60 additions and 3 deletions
+3
View File
@@ -779,6 +779,9 @@ function cpuTemperature(callback) {
result.max = (maxtmp > result.main) ? maxtmp : result.main;
}
if (result.main !== -1) {
if (result.max === -1) {
result.max = result.main;
}
if (callback) { callback(result); }
resolve(result);
}
+2
View File
@@ -314,7 +314,9 @@ export namespace Systeminformation {
iface: string;
ifaceName: string;
ip4: string;
ip4subnet: string;
ip6: string;
ip6subnet: string;
mac: string;
internal: boolean;
virtual: boolean;
+20
View File
@@ -694,13 +694,27 @@ function networkInterfaces(callback) {
if (_darwin || _freebsd || _openbsd || _netbsd) {
nics = getDarwinNics();
nics.forEach(nic => {
if ({}.hasOwnProperty.call(ifaces, nic.iface)) {
ifaces[nic.iface].forEach(function (details) {
if (details.family === 'IPv4') {
nic.ip4subnet = details.netmask;
}
if (details.family === 'IPv6') {
nic.ip6subnet = details.netmask;
}
});
}
result.push({
iface: nic.iface,
ifaceName: nic.iface,
ip4: nic.ip4,
ip4subnet: nic.ip4subnet || '',
ip6: nic.ip6,
ip6subnet: nic.ip6subnet || '',
mac: nic.mac,
internal: nic.internal,
virtual: nic.internal ? false : testVirtualNic(nic.iface, nic.iface, nic.mac),
@@ -737,7 +751,9 @@ function networkInterfaces(callback) {
}
for (let dev in ifaces) {
let ip4 = '';
let ip4subnet = '';
let ip6 = '';
let ip6subnet = '';
let mac = '';
let duplex = '';
let mtu = '';
@@ -755,10 +771,12 @@ function networkInterfaces(callback) {
ifaces[dev].forEach(function (details) {
if (details.family === 'IPv4') {
ip4 = details.address;
ip4subnet = details.netmask;
}
if (details.family === 'IPv6') {
if (!ip6 || ip6.match(/^fe80::/i)) {
ip6 = details.address;
ip6subnet = details.netmask;
}
}
mac = details.mac;
@@ -852,7 +870,9 @@ function networkInterfaces(callback) {
iface: dev,
ifaceName,
ip4,
ip4subnet,
ip6,
ip6subnet,
mac,
internal,
virtual,