From 0564bb3b35117c7367469dd5582a5a4093078586 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 21 Sep 2016 14:09:46 -0700 Subject: added missing copyright/license info from ZT_jniutils --- java/jni/ZT_jniutils.cpp | 18 ++++++++++++++++++ java/jni/ZT_jniutils.h | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) (limited to 'java') diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp index 6faa91a4..7ecc7256 100644 --- a/java/jni/ZT_jniutils.cpp +++ b/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 . + */ + #include "ZT_jniutils.h" #include "ZT_jnilookup.h" #include diff --git a/java/jni/ZT_jniutils.h b/java/jni/ZT_jniutils.h index 4dec7201..e35d4f42 100644 --- a/java/jni/ZT_jniutils.h +++ b/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 . + */ + #ifndef ZT_jniutils_h_ #define ZT_jniutils_h_ #include -- cgit v1.2.3 From 40d3993ceb64f924167572c3add7300abb434562 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 21 Sep 2016 14:12:20 -0700 Subject: java code still needed to reflect PEER_ROLE_RELAY rename to PEER_ROLE_UPSTREAM --- java/jni/ZT_jniutils.cpp | 2 +- java/src/com/zerotier/sdk/PeerRole.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'java') diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp index 7ecc7256..27ca7374 100644 --- a/java/jni/ZT_jniutils.cpp +++ b/java/jni/ZT_jniutils.cpp @@ -181,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"; diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java index d7d55f05..f281c1b6 100644 --- a/java/src/com/zerotier/sdk/PeerRole.java +++ b/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 -- cgit v1.2.3