mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-01-25 22:00:14 +00:00
1c5897895b
* add note about forceTcpRelay * Create a sample systemd unit for tcp proxy * set gitattributes for rust & cargo so hashes dont conflict on Windows * Revert "set gitattributes for rust & cargo so hashes dont conflict on Windows" This reverts commit 032dc5c108195f6bbc2e224f00da5b785df4b7f9. * Turn off autocrlf for rust source Doesn't appear to play nice well when it comes to git and vendored cargo package hashes * Fix #1883 (#1886) Still unknown as to why, but the call to `nc->GetProperties()` can fail when setting a friendly name on the Windows virtual ethernet adapter. Ensure that `ncp` is not null before continuing and accessing the device GUID. * Don't vendor packages for zeroidc (#1885) * Added docker environment way to join networks (#1871) * add StringUtils * fix headers use recommended headers and remove unused headers * move extern "C" only JNI functions need to be exported * cleanup * fix ANDROID-50: RESULT_ERROR_BAD_PARAMETER typo * fix typo in log message * fix typos in JNI method signatures * fix typo * fix ANDROID-51: fieldName is uninitialized * fix ANDROID-35: memory leak * fix missing DeleteLocalRef in loops * update to use unique error codes * add GETENV macro * add LOG_TAG defines * ANDROID-48: add ZT_jnicache.cpp * ANDROID-48: use ZT_jnicache.cpp and remove ZT_jnilookup.cpp and ZT_jniarray.cpp * add Event.fromInt * add PeerRole.fromInt * add ResultCode.fromInt * fix ANDROID-36: issues with ResultCode * add VirtualNetworkConfigOperation.fromInt * fix ANDROID-40: VirtualNetworkConfigOperation out-of-sync with ZT_VirtualNetworkConfigOperation enum * add VirtualNetworkStatus.fromInt * fix ANDROID-37: VirtualNetworkStatus out-of-sync with ZT_VirtualNetworkStatus enum * add VirtualNetworkType.fromInt * make NodeStatus a plain data class * fix ANDROID-52: synchronization bug with nodeMap * Node init work: separate Node construction and init * add Node.toString * make PeerPhysicalPath a plain data class * remove unused PeerPhysicalPath.fixed * add array functions * make Peer a plain data class * make Version a plain data class * fix ANDROID-42: copy/paste error * fix ANDROID-49: VirtualNetworkConfig.equals is wrong * reimplement VirtualNetworkConfig.equals * reimplement VirtualNetworkConfig.compareTo * add VirtualNetworkConfig.hashCode * make VirtualNetworkConfig a plain data class * remove unused VirtualNetworkConfig.enabled * reimplement VirtualNetworkDNS.equals * add VirtualNetworkDNS.hashCode * make VirtualNetworkDNS a plain data class * reimplement VirtualNetworkRoute.equals * reimplement VirtualNetworkRoute.compareTo * reimplement VirtualNetworkRoute.toString * add VirtualNetworkRoute.hashCode * make VirtualNetworkRoute a plain data class * add isSocketAddressEmpty * add addressPort * add fromSocketAddressObject * invert logic in a couple of places and return early * newInetAddress and newInetSocketAddress work allow newInetSocketAddress to return NULL if given empty address * fix ANDROID-38: stack corruption in onSendPacketRequested * use GETENV macro * JniRef work JniRef does not use callbacks struct, so remove fix NewGlobalRef / DeleteGlobalRef mismatch * use PRId64 macros * switch statement work * comments and logging * Modifier 'public' is redundant for interface members * NodeException can be made a checked Exception * 'NodeException' does not define a 'serialVersionUID' field * 'finalize()' should not be overridden this is fine to do because ZeroTierOneService calls close() when it is done * error handling, error reporting, asserts, logging * simplify loadLibrary * rename Node.networks -> Node.networkConfigs * Windows file permissions fix (#1887) * Allow macOS interfaces to use multiple IP addresses (#1879) Co-authored-by: Sean OMeara <someara@users.noreply.github.com> Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com> * Fix condition where full HELLOs might not be sent when necessary (#1877) Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com> * 1.10.4 version bumps * Add security policy to repo (#1889) * [+] add e2k64 arch (#1890) * temp fix for ANDROID-56: crash inside newNetworkConfig from too many args * 1.10.4 release notes --------- Co-authored-by: travis laduke <travisladuke@gmail.com> Co-authored-by: Grant Limberg <grant.limberg@zerotier.com> Co-authored-by: Grant Limberg <glimberg@users.noreply.github.com> Co-authored-by: Leonardo Amaral <leleobhz@users.noreply.github.com> Co-authored-by: Brenton Bostick <bostick@gmail.com> Co-authored-by: Sean OMeara <someara@users.noreply.github.com> Co-authored-by: Joseph Henry <joseph-henry@users.noreply.github.com> Co-authored-by: Roman Peshkichev <roman.peshkichev@gmail.com>
170 lines
5.5 KiB
C++
170 lines
5.5 KiB
C++
/*
|
|
* 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 <jni.h>
|
|
#include <ZeroTierOne.h>
|
|
|
|
#include <limits> // for numeric_limits
|
|
#include <sys/socket.h> // for sockaddr_storage
|
|
|
|
#if defined(__ANDROID__)
|
|
|
|
#include <android/log.h>
|
|
|
|
#if !defined(NDEBUG)
|
|
#define LOGV(...) ((void)__android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
|
|
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))
|
|
#else
|
|
#define LOGV(...)
|
|
#define LOGD(...)
|
|
#endif
|
|
|
|
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))
|
|
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))
|
|
#else
|
|
#if !defined(NDEBUG)
|
|
#define LOGV(...) fprintf(stdout, __VA_ARGS__)
|
|
#define LOGD(...) fprintf(stdout, __VA_ARGS__)
|
|
#else
|
|
#define LOGV(...)
|
|
#define LOGD(...)
|
|
#endif
|
|
|
|
#define LOGI(...) fprintf(stdout, __VA_ARGS__)
|
|
#define LOGE(...) fprintf(stdout, __VA_ARGS__)
|
|
#endif
|
|
|
|
//
|
|
// Call GetEnv and assert if there is an error
|
|
//
|
|
#define GETENV(env, vm) \
|
|
do { \
|
|
jint getEnvRet; \
|
|
assert(vm); \
|
|
if ((getEnvRet = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6)) != JNI_OK) { \
|
|
LOGE("Error calling GetEnv: %d", getEnvRet); \
|
|
assert(false && "Error calling GetEnv"); \
|
|
} \
|
|
} while (false)
|
|
|
|
//
|
|
// Call GetJavaVM and assert if there is an error
|
|
//
|
|
#define GETJAVAVM(env, vm) \
|
|
do { \
|
|
jint getJavaVMRet; \
|
|
if ((getJavaVMRet = env->GetJavaVM(&vm)) != 0) { \
|
|
LOGE("Error calling GetJavaVM: %d", getJavaVMRet); \
|
|
assert(false && "Error calling GetJavaVM"); \
|
|
} \
|
|
} while (false)
|
|
|
|
|
|
const jsize JSIZE_MAX = std::numeric_limits<jsize>::max();
|
|
|
|
jobject createResultObject(JNIEnv *env, ZT_ResultCode code);
|
|
jobject createVirtualNetworkStatus(JNIEnv *env, ZT_VirtualNetworkStatus status);
|
|
jobject createVirtualNetworkType(JNIEnv *env, ZT_VirtualNetworkType type);
|
|
jobject createEvent(JNIEnv *env, ZT_Event event);
|
|
jobject createPeerRole(JNIEnv *env, ZT_PeerRole role);
|
|
jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT_VirtualNetworkConfigOperation op);
|
|
|
|
jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr);
|
|
jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr);
|
|
int addressPort(const sockaddr_storage addr);
|
|
|
|
jobject newPeer(JNIEnv *env, const ZT_Peer &peer);
|
|
jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp);
|
|
|
|
jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &config);
|
|
|
|
jobject newVersion(JNIEnv *env, int major, int minor, int rev);
|
|
|
|
jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route);
|
|
|
|
jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns);
|
|
|
|
jobject newNodeStatus(JNIEnv *env, const ZT_NodeStatus &status);
|
|
|
|
jobjectArray newPeerArray(JNIEnv *env, const ZT_Peer *peers, size_t count);
|
|
|
|
jobjectArray newVirtualNetworkConfigArray(JNIEnv *env, const ZT_VirtualNetworkConfig *networks, size_t count);
|
|
|
|
jobjectArray newPeerPhysicalPathArray(JNIEnv *env, const ZT_PeerPhysicalPath *paths, size_t count);
|
|
|
|
jobjectArray newInetSocketAddressArray(JNIEnv *env, const sockaddr_storage *addresses, size_t count);
|
|
|
|
jobjectArray newVirtualNetworkRouteArray(JNIEnv *env, const ZT_VirtualNetworkRoute *routes, size_t count);
|
|
|
|
//
|
|
// log functions only for newArrayObject below
|
|
//
|
|
void newArrayObject_logCount(size_t count);
|
|
void newArrayObject_log(const char *msg);
|
|
|
|
//
|
|
// function template for creating array objects
|
|
//
|
|
template <typename T, jobject (*F)(JNIEnv *, const T &)>
|
|
jobjectArray newArrayObject(JNIEnv *env, const T *buffer, size_t count, jclass clazz) {
|
|
|
|
if (count > JSIZE_MAX) {
|
|
newArrayObject_logCount(count);
|
|
return NULL;
|
|
}
|
|
|
|
jsize jCount = static_cast<jsize>(count);
|
|
|
|
jobjectArray arrayObj = env->NewObjectArray(jCount, clazz, NULL);
|
|
if (env->ExceptionCheck() || arrayObj == NULL) {
|
|
newArrayObject_log("Error creating array object");
|
|
return NULL;
|
|
}
|
|
|
|
for (jsize i = 0; i < jCount; i++) {
|
|
|
|
jobject obj = F(env, buffer[i]);
|
|
if(env->ExceptionCheck() || obj == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
env->SetObjectArrayElement(arrayObj, i, obj);
|
|
if(env->ExceptionCheck()) {
|
|
newArrayObject_log("Error assigning object to array");
|
|
return NULL;
|
|
}
|
|
|
|
env->DeleteLocalRef(obj);
|
|
}
|
|
|
|
return arrayObj;
|
|
}
|
|
|
|
jbyteArray newByteArray(JNIEnv *env, const unsigned char *bytes, size_t count);
|
|
|
|
jbyteArray newByteArray(JNIEnv *env, size_t count);
|
|
|
|
bool isSocketAddressEmpty(const sockaddr_storage addr);
|
|
|
|
sockaddr_storage fromSocketAddressObject(JNIEnv *env, jobject sockAddressObject);
|
|
|
|
#endif // ZT_jniutils_h_
|