From 424720211d83f8470592ab4013a0b7b8122dfc8b Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Tue, 25 Jun 2019 23:39:35 -0700 Subject: [PATCH] Updated NetInfo, so desc is omitted if it's blank (MacOS/FreeBSD). Updated os.networkInterfaces() for FreeBSD --- meshcore/agentcore.c | 3 ++- microscript/ILibDuktape_ScriptContainer.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c index 1c77a01..35a87ca 100644 --- a/meshcore/agentcore.c +++ b/meshcore/agentcore.c @@ -1582,7 +1582,8 @@ duk_ret_t ILibDuktape_MeshAgent_NetInfo(duk_context *ctx) {\ if(ni[tmp[0]][i].family == 'IPv4')\ {\ - var ret = {v4addr: ni[tmp[0]][i].address, v4mask: ni[tmp[0]][i].netmask, mac: ni[tmp[0]][i].mac.split(':').join(''), gatewaymac: tmp[1], name: tmp[0], desc: dvname};\ + var ret = {v4addr: ni[tmp[0]][i].address, v4mask: ni[tmp[0]][i].netmask, mac: ni[tmp[0]][i].mac.split(':').join(''), gatewaymac: tmp[1], name: tmp[0]};\ + if(dvname != '') {ret['desc'] = dvname;}\ return({netif: {0: ret}});\ }\ }\ diff --git a/microscript/ILibDuktape_ScriptContainer.c b/microscript/ILibDuktape_ScriptContainer.c index 349091f..fecaa6b 100644 --- a/microscript/ILibDuktape_ScriptContainer.c +++ b/microscript/ILibDuktape_ScriptContainer.c @@ -1816,7 +1816,7 @@ void ILibDuktape_ScriptContainer_OS_Push(duk_context *ctx, void *chain) return(defaultGateways);\ }\ }\ - if(process.platform == 'darwin')\ + if(process.platform == 'darwin' || process.platform == 'freebsd')\ {\ exports.networkInterfaces = function()\ {\