diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-07-14 19:29:10 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-07-14 19:29:10 -0700 |
| commit | 2afe3d89d00c0336db3e293d2e9dbd8d0e0083e7 (patch) | |
| tree | f07d029f5a76ac3cbea1ac92491e2cfa59391572 /service/ControlPlane.cpp | |
| parent | 8a15b42dabbacd522bfc7c2042591fa71692136c (diff) | |
| parent | bdc3b0834bb8abc621ee6dbc9a92769b57376bee (diff) | |
| download | infinitytier-2afe3d89d00c0336db3e293d2e9dbd8d0e0083e7.tar.gz infinitytier-2afe3d89d00c0336db3e293d2e9dbd8d0e0083e7.zip | |
Merge branch 'master' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne
Diffstat (limited to 'service/ControlPlane.cpp')
| -rw-r--r-- | service/ControlPlane.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 0e2b530d..a10697a9 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -190,13 +190,15 @@ static std::string _jsonEnumerate(unsigned int depth,const ZT_PeerPhysicalPath * "%s\t\"lastSend\": %llu,\n" "%s\t\"lastReceive\": %llu,\n" "%s\t\"active\": %s,\n" - "%s\t\"preferred\": %s\n" + "%s\t\"preferred\": %s,\n" + "%s\t\"trustedPathId\": %llu\n" "%s}", prefix,_jsonEscape(reinterpret_cast<const InetAddress *>(&(pp[i].address))->toString()).c_str(), prefix,pp[i].lastSend, prefix,pp[i].lastReceive, prefix,(pp[i].active == 0) ? "false" : "true", prefix,(pp[i].preferred == 0) ? "false" : "true", + prefix,pp[i].trustedPathId, prefix); buf.append(json); } |