From 3db019786506492bd217ebf37aa1ab9261c8808e Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 6 Aug 2019 15:22:57 -0500
Subject: Add try/catch in LFDB and add introspection into multicast
 subscriptions in client network status API

---
 service/OneService.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'service/OneService.cpp')

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)
-- 
cgit v1.2.3