summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2019-08-06 15:22:57 -0500
committerAdam Ierymenko <adam.ierymenko@gmail.com>2019-08-06 15:22:57 -0500
commit3db019786506492bd217ebf37aa1ab9261c8808e (patch)
tree594b48a5a40837c6242af262c4a2889d502009d5 /service
parent6174c0c103ee2339912589ba4cb8549d19b0d900 (diff)
downloadinfinitytier-3db019786506492bd217ebf37aa1ab9261c8808e.tar.gz
infinitytier-3db019786506492bd217ebf37aa1ab9261c8808e.zip
Add try/catch in LFDB and add introspection into multicast subscriptions in client network status API
Diffstat (limited to 'service')
-rw-r--r--service/OneService.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 43f5d9c9..7c9671e5 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -273,6 +273,15 @@ static void _networkToJson(nlohmann::json &nj,const ZT_VirtualNetworkConfig *nc,
ra.push_back(rj);
}
nj["routes"] = ra;
+
+ nlohmann::json mca = nlohmann::json::array();
+ for(unsigned int i=0;i<nc->multicastSubscriptionCount;++i) {
+ nlohmann::json m;
+ m["mac"] = MAC(nc->multicastSubscriptions[i].mac).toString(tmp);
+ m["adi"] = nc->multicastSubscriptions[i].adi;
+ mca.push_back(m);
+ }
+ nj["multicastSubscriptions"] = mca;
}
static void _peerToJson(nlohmann::json &pj,const ZT_Peer *peer)