diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-13 14:27:14 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-13 14:27:14 -0800 |
| commit | 16f11e91d1e574976483dc8725d27b9bb7cb7800 (patch) | |
| tree | 0eaa25a6a23f762e8bd5ca6fb6fd4f045a556fa9 /java | |
| parent | 4b115665057a334c08e427e0f34a4e3a48514ea1 (diff) | |
| parent | 9ae49b5b85092ad3d6d9128a084c93f2a70661f9 (diff) | |
| download | infinitytier-16f11e91d1e574976483dc8725d27b9bb7cb7800.tar.gz infinitytier-16f11e91d1e574976483dc8725d27b9bb7cb7800.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'java')
| -rw-r--r-- | java/jni/ZT_jniutils.cpp | 8 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/PeerRole.java | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp index e355271c..7bdc7611 100644 --- 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; } diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java index f281c1b6..fce183d9 100644 --- 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 }
\ No newline at end of file |