From 96576757552f1b0ce002df3e904419b7bfca62f8 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Jul 2016 11:30:22 -0700 Subject: Plumbing through trusted path stuff to OneService. --- service/ControlPlane.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'service/ControlPlane.cpp') 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(&(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); } -- cgit v1.2.3 From 6ec3464ee94dc9059477c6ef8f7c4d7e4045b914 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 12 Jul 2016 13:58:15 -0700 Subject: JSON fix for trusted paths (does not affect normal op) --- service/ControlPlane.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/ControlPlane.cpp') diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index ced36e75..a10697a9 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -191,7 +191,7 @@ static std::string _jsonEnumerate(unsigned int depth,const ZT_PeerPhysicalPath * "%s\t\"lastReceive\": %llu,\n" "%s\t\"active\": %s,\n" "%s\t\"preferred\": %s,\n" - "%s\t\"trustedPathId\": %llx\n" + "%s\t\"trustedPathId\": %llu\n" "%s}", prefix,_jsonEscape(reinterpret_cast(&(pp[i].address))->toString()).c_str(), prefix,pp[i].lastSend, -- cgit v1.2.3