summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-06-26 17:44:09 -0700
committerGrant Limberg <glimberg@gmail.com>2015-06-26 17:44:09 -0700
commit9c26d10ea645dc1727813ea72a63f526cf0757d0 (patch)
tree25ae8e785f07f93f187a34abe204c423613a009b /service
parentbfb152f53f528934583ee76437453a005610a7ea (diff)
parent3f71afd0fbb2d87a2c9288166299600da51470dc (diff)
downloadinfinitytier-9c26d10ea645dc1727813ea72a63f526cf0757d0.tar.gz
infinitytier-9c26d10ea645dc1727813ea72a63f526cf0757d0.zip
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service')
-rw-r--r--service/ControlPlane.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
index e42c9ef8..01582586 100644
--- a/service/ControlPlane.cpp
+++ b/service/ControlPlane.cpp
@@ -211,9 +211,9 @@ static void _jsonAppend(unsigned int depth,std::string &buf,const ZT1_Peer *peer
const char *prole = "";
switch(peer->role) {
- case ZT1_PEER_ROLE_LEAF: prole = "LEAF"; break;
- case ZT1_PEER_ROLE_HUB: prole = "HUB"; break;
- case ZT1_PEER_ROLE_ROOTSERVER: prole = "ROOT"; break;
+ case ZT1_PEER_ROLE_LEAF: prole = "LEAF"; break;
+ case ZT1_PEER_ROLE_RELAY: prole = "RELAY"; break;
+ case ZT1_PEER_ROLE_ROOT: prole = "ROOT"; break;
}
Utils::snprintf(json,sizeof(json),