diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-06-12 09:38:52 -0700 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-06-12 09:38:52 -0700 |
commit | 817b9d012e2d345b77b12537e3857b575941f9c2 (patch) | |
tree | 3c00e166df6c2405c260fa2ce651296e59673b28 /controller/EmbeddedNetworkController.cpp | |
parent | d55c732e1915affd2f40321261bb8178fa28f95a (diff) | |
parent | dce9cb27c1f464cb4a5111c27502d8ca1d7297de (diff) | |
download | infinitytier-817b9d012e2d345b77b12537e3857b575941f9c2.tar.gz infinitytier-817b9d012e2d345b77b12537e3857b575941f9c2.zip |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'controller/EmbeddedNetworkController.cpp')
-rw-r--r-- | controller/EmbeddedNetworkController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 9a07b285..ef52f6e0 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -551,7 +551,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET( for(auto member=members.begin();member!=members.end();++member) { mid = (*member)["id"]; char tmp[128]; - OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s\"%s\":%llu",(responseBody.length() > 1) ? ",\"" : "\"",mid.c_str(),(unsigned long long)OSUtils::jsonInt((*member)["revision"],0)); + OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s\"%s\":%llu",(responseBody.length() > 1) ? "," : "",mid.c_str(),(unsigned long long)OSUtils::jsonInt((*member)["revision"],0)); responseBody.append(tmp); } } |