ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 23:10:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge OneService changes from master.

Browse Source
This commit is contained in:
Adam Ierymenko 2022-03-10 15:50:01 -05:00
commit 3e78785dea
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/OneService.cpp
View File

@ -510,6 +510,7 @@ static void _peerToJson(nlohmann::json &pj,const ZT_Peer *peer)
pj["isBonded"] = peer->isBonded; pj["isBonded"] = peer->isBonded;
if (peer->isBonded) { if (peer->isBonded) {
pj["bondingPolicy"] = peer->bondingPolicy; pj["bondingPolicy"] = peer->bondingPolicy;
pj["isHealthy"] = peer->isHealthy;
pj["numAliveLinks"] = peer->numAliveLinks; pj["numAliveLinks"] = peer->numAliveLinks;
pj["numTotalLinks"] = peer->numTotalLinks; pj["numTotalLinks"] = peer->numTotalLinks;
} }
@ -541,6 +542,7 @@ static void _bondToJson(nlohmann::json &pj, SharedPtr<Bond> &bond)
return; return;
} }
pj["isHealthy"] = bond->isHealthy();
pj["numAliveLinks"] = bond->getNumAliveLinks(); pj["numAliveLinks"] = bond->getNumAliveLinks();
pj["numTotalLinks"] = bond->getNumTotalLinks(); pj["numTotalLinks"] = bond->getNumTotalLinks();
pj["failoverInterval"] = bond->getFailoverInterval(); pj["failoverInterval"] = bond->getFailoverInterval();