Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

9 years ago · 16f11e91d1
2 changed files with 8 additions and 8 deletions
--- a/java/jni/ZT_jniutils.cpp
+++ b/java/jni/ZT_jniutils.cpp
@ -182,11 +182,11 @@ jobject createPeerRole(JNIEnv *env, ZT_PeerRole role)
    case ZT_PEER_ROLE_LEAF:
        fieldName = "PEER_ROLE_LEAF";
        break;
-    case ZT_PEER_ROLE_UPSTREAM:
-        fieldName = "PEER_ROLE_UPSTREAM";
+    case ZT_PEER_ROLE_MOON:
+        fieldName = "PEER_ROLE_MOON";
        break;
-    case ZT_PEER_ROLE_ROOT:
-        fieldName = "PEER_ROLE_ROOTS";
+    case ZT_PEER_ROLE_PLANET:
+        fieldName = "PEER_ROLE_PLANET";
        break;
    }

--- a/java/src/com/zerotier/sdk/PeerRole.java
+++ b/java/src/com/zerotier/sdk/PeerRole.java
@ -34,12 +34,12 @@ public enum PeerRole {
    PEER_ROLE_LEAF,

    /**
-     * upstream node
+     * moon root
     */
-    PEER_ROLE_UPSTREAM,
+    PEER_ROLE_MOON,

    /**
-     * root server
+     * planetary root
     */
-    PEER_ROLE_ROOT
+    PEER_ROLE_PLANET
 }