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

java/jni/ZT_jniutils.cpp

@@ -1,3 +1,21 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 #include "ZT_jniutils.h"
 #include "ZT_jnilookup.h"
 #include <string>
@@ -163,7 +181,7 @@ jobject createPeerRole(JNIEnv *env, ZT_PeerRole role)
         fieldName = "PEER_ROLE_LEAF";
         break;
     case ZT_PEER_ROLE_UPSTREAM:
-        fieldName = "PEER_ROLE_RELAY";
+        fieldName = "PEER_ROLE_UPSTREAM";
         break;
     case ZT_PEER_ROLE_ROOT:
         fieldName = "PEER_ROLE_ROOTS";

java/jni/ZT_jniutils.h

@@ -1,3 +1,21 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 #ifndef ZT_jniutils_h_
 #define ZT_jniutils_h_
 #include <stdio.h>

java/src/com/zerotier/sdk/PeerRole.java

@@ -34,9 +34,9 @@ public enum PeerRole {
     PEER_ROLE_LEAF,
 
     /**
-     * relay node
+     * upstream node
      */
-    PEER_ROLE_RELAY,
+    PEER_ROLE_UPSTREAM,
 
     /**
      * root server