ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-09 04:04:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Ierymenko 2017-02-13 14:27:14 -08:00
commit 16f11e91d1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/jni/ZT_jniutils.cpp
View File

@ -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;
}

8
java/src/com/zerotier/sdk/PeerRole.java
View File

@ -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
}