summaryrefslogtreecommitdiff
path: root/service/ControlPlane.cpp
diff options
context:
space:
mode:
authorGrant Limberg <glimberg@gmail.com>2015-06-17 18:42:23 -0700
committerGrant Limberg <glimberg@gmail.com>2015-06-17 18:42:23 -0700
commitdfdd46db80331104366747e336323095aba2c886 (patch)
tree9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /service/ControlPlane.cpp
parentc59c74dddab862ade65938e630dc0f561fcb0c2f (diff)
parent87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff)
downloadinfinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz
infinitytier-dfdd46db80331104366747e336323095aba2c886.zip
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service/ControlPlane.cpp')
-rw-r--r--service/ControlPlane.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/ControlPlane.cpp b/service/ControlPlane.cpp
index 4158ed43..e42c9ef8 100644
--- a/service/ControlPlane.cpp
+++ b/service/ControlPlane.cpp
@@ -213,7 +213,7 @@ static void _jsonAppend(unsigned int depth,std::string &buf,const ZT1_Peer *peer
switch(peer->role) {
case ZT1_PEER_ROLE_LEAF: prole = "LEAF"; break;
case ZT1_PEER_ROLE_HUB: prole = "HUB"; break;
- case ZT1_PEER_ROLE_SUPERNODE: prole = "SUPERNODE"; break;
+ case ZT1_PEER_ROLE_ROOTSERVER: prole = "ROOT"; break;
}
Utils::snprintf(json,sizeof(json),