summaryrefslogtreecommitdiff
path: root/service/ControlPlane.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-07-12 11:30:22 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-07-12 11:30:22 -0700
commit96576757552f1b0ce002df3e904419b7bfca62f8 (patch)
tree488029d8d7c645b581293e95fe311ef599464c81 /service/ControlPlane.cpp
parent5d7174b162055340eb7622dd2e1e556c5a2dcd42 (diff)
downloadinfinitytier-96576757552f1b0ce002df3e904419b7bfca62f8.tar.gz
infinitytier-96576757552f1b0ce002df3e904419b7bfca62f8.zip
Plumbing through trusted path stuff to OneService.
Diffstat (limited to 'service/ControlPlane.cpp')
-rw-r--r--service/ControlPlane.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
index 0e2b530d..ced36e75 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\": %llx\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);
}