Merge remote-tracking branch 'origin/expose-surface-addresses' into dev

This commit is contained in:
Joseph Henry 2022-10-25 13:55:21 -07:00
commit 3b11915eab
2 changed files with 12 additions and 0 deletions

View file

@ -1536,6 +1536,15 @@ public:
}
settings["listeningOn"] = boundAddrArray;
std::vector<InetAddress> surfaceAddrs = _node-> SurfaceAddresses();
auto surfaceAddrArray = json::array();
for (int i = 0; i < surfaceAddrs.size(); i++) {
char ipBuf[64] = { 0 };
surfaceAddrs[i].toString(ipBuf);
surfaceAddrArray.push_back(ipBuf);
}
settings["surfaceAddresses"] = surfaceAddrArray;
#ifdef ZT_USE_MINIUPNPC
settings["portMappingEnabled"] = OSUtils::jsonBool(settings["portMappingEnabled"],true);
#else