diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
| commit | dfdd46db80331104366747e336323095aba2c886 (patch) | |
| tree | 9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /service | |
| parent | c59c74dddab862ade65938e630dc0f561fcb0c2f (diff) | |
| parent | 87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff) | |
| download | infinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz infinitytier-dfdd46db80331104366747e336323095aba2c886.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service')
| -rw-r--r-- | service/ControlPlane.cpp | 2 | ||||
| -rw-r--r-- | service/README.md | 4 |
2 files changed, 3 insertions, 3 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), diff --git a/service/README.md b/service/README.md index 2a283cbd..df62ff27 100644 --- a/service/README.md +++ b/service/README.md @@ -106,7 +106,7 @@ Getting /peer returns an array of peer objects for all current peers. See below <tr><td>versionRev</td><td>integer</td><td>Revision of remote if known</td><td>no</td></tr> <tr><td>version</td><td>string</td><td>Version in major.minor.rev format</td><td>no</td></tr> <tr><td>latency</td><td>integer</td><td>Latency in milliseconds if known</td><td>no</td></tr> -<tr><td>role</td><td>string</td><td>LEAF, HUB, or SUPERNODE</td><td>no</td></tr> +<tr><td>role</td><td>string</td><td>LEAF, HUB, or ROOTSERVER</td><td>no</td></tr> <tr><td>paths</td><td>[object]</td><td>Array of path objects (see below)</td><td>no</td></tr> </table> @@ -184,7 +184,7 @@ Relays, IP assignment pools, and rules are edited via direct POSTs to the networ **Relay object format:** -Relay objects define network-specific preferred relay nodes. Traffic to peers on this network will preferentially use these relays if they are available, and otherwise will fall back to the global supernode infrastructure. +Relay objects define network-specific preferred relay nodes. Traffic to peers on this network will preferentially use these relays if they are available, and otherwise will fall back to the global rootserver infrastructure. <table> <tr><td><b>Field</b></td><td><b>Type</b></td><td><b>Description</b></td></tr> |