diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-05-22 14:52:23 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-05-22 14:52:23 -0700 |
| commit | 9774f789f21c05267ef35cc35684b0a7ce2efb2a (patch) | |
| tree | 8ca8c0c0ac9910f7d40845ddf419120ea56fbb48 /service/ControlPlane.cpp | |
| parent | cdec05af24f129ed12cf2b43eaa876521c358a0b (diff) | |
| download | infinitytier-9774f789f21c05267ef35cc35684b0a7ce2efb2a.tar.gz infinitytier-9774f789f21c05267ef35cc35684b0a7ce2efb2a.zip | |
TCP fallback tunneling is now working. That hurt more than expected.
Diffstat (limited to 'service/ControlPlane.cpp')
| -rw-r--r-- | service/ControlPlane.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp index 2e8290ed..71b3fd3f 100644 --- a/service/ControlPlane.cpp +++ b/service/ControlPlane.cpp @@ -360,18 +360,20 @@ unsigned int ControlPlane::handleRequest( _node->status(&status); Utils::snprintf(json,sizeof(json), "{\n" - "\t\"address\":\"%.10llx\",\n" - "\t\"publicIdentity\":\"%s\",\n" - "\t\"online\":%s,\n" - "\t\"versionMajor\":%d,\n" - "\t\"versionMinor\":%d,\n" - "\t\"versionRev\":%d,\n" - "\t\"version\":\"%d.%d.%d\",\n" + "\t\"address\": \"%.10llx\",\n" + "\t\"publicIdentity\": \"%s\",\n" + "\t\"online\": %s,\n" + "\t\"tcpFallbackActive\": %s,\n" + "\t\"versionMajor\": %d,\n" + "\t\"versionMinor\": %d,\n" + "\t\"versionRev\": %d,\n" + "\t\"version\": \"%d.%d.%d\",\n" "\t\"clock\": %llu\n" "}\n", status.address, status.publicIdentity, (status.online) ? "true" : "false", + (_svc->tcpFallbackActive()) ? "true" : "false", ZEROTIER_ONE_VERSION_MAJOR, ZEROTIER_ONE_VERSION_MINOR, ZEROTIER_ONE_VERSION_REVISION, |