mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-02-11 21:45:18 +00:00
a872cc3418
* 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 * Windows 1.10.4 Advanced Installer bump * Revert "temp fix for ANDROID-56: crash inside newNetworkConfig from too many args" This reverts commit dd627cd7f44ad623a110bb14f72d0bea72a09e30. * actual fix for ANDROID-56: crash inside newNetworkConfig cast all arguments to varargs functions as good style * Fix addIp being called with applied ips (#1897) This was getting called outside of the check for existing ips Because of the added ifdef and a brace getting moved to the wrong place. ``` if (! n.tap()->addIp(*ip)) { fprintf(stderr, "ERROR: unable to add ip address %s" ZT_EOL_S, ip->toString(ipbuf)); } WinFWHelper::newICMPRule(*ip, n.config().nwid); ``` * 1.10.5 (#1905) * 1.10.5 bump * 1.10.5 for Windows * 1.10.5 * Prevent path-learning loops (#1914) * Prevent path-learning loops * Only allow new overwrite if not bonded * fix binding temporary ipv6 addresses on macos (#1910) The check code wasn't running. I don't know why !defined(TARGET_OS_IOS) would exclude code on desktop macOS. I did a quick search and changed it to defined(TARGET_OS_MAC). Not 100% sure what the most correct solution there is. You can verify the old and new versions with `ifconfig | grep temporary` plus `zerotier-cli info -j` -> listeningOn * 1.10.6 (#1929) * 1.10.5 bump * 1.10.6 * 1.10.6 AIP for Windows. --------- 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>
237 lines
11 KiB
C++
237 lines
11 KiB
C++
//
|
|
// Created by Brenton Bostick on 1/18/23.
|
|
//
|
|
|
|
#include "ZT_jnicache.h"
|
|
|
|
#include "ZT_jniutils.h"
|
|
|
|
#include <cassert>
|
|
|
|
#define LOG_TAG "Cache"
|
|
|
|
#define EXCEPTIONANDNULLCHECK(var) \
|
|
do { \
|
|
if (env->ExceptionCheck()) { \
|
|
assert(false && "Exception"); \
|
|
} \
|
|
if ((var) == NULL) { \
|
|
assert(false && #var " is NULL"); \
|
|
} \
|
|
} while (false)
|
|
|
|
#define SETCLASS(classVar, classNameString) \
|
|
do { \
|
|
jclass classVar ## _local = env->FindClass(classNameString); \
|
|
EXCEPTIONANDNULLCHECK(classVar ## _local); \
|
|
classVar = reinterpret_cast<jclass>(env->NewGlobalRef(classVar ## _local)); \
|
|
EXCEPTIONANDNULLCHECK(classVar); \
|
|
env->DeleteLocalRef(classVar ## _local); \
|
|
} while (false)
|
|
|
|
#define SETOBJECT(objectVar, code) \
|
|
do { \
|
|
jobject objectVar ## _local = code; \
|
|
EXCEPTIONANDNULLCHECK(objectVar ## _local); \
|
|
objectVar = env->NewGlobalRef(objectVar ## _local); \
|
|
EXCEPTIONANDNULLCHECK(objectVar); \
|
|
env->DeleteLocalRef(objectVar ## _local); \
|
|
} while (false)
|
|
|
|
|
|
//
|
|
// Classes
|
|
//
|
|
|
|
jclass ArrayList_class;
|
|
jclass DataStoreGetListener_class;
|
|
jclass DataStorePutListener_class;
|
|
jclass EventListener_class;
|
|
jclass Event_class;
|
|
jclass Inet4Address_class;
|
|
jclass Inet6Address_class;
|
|
jclass InetAddress_class;
|
|
jclass InetSocketAddress_class;
|
|
jclass NodeStatus_class;
|
|
jclass Node_class;
|
|
jclass PacketSender_class;
|
|
jclass PathChecker_class;
|
|
jclass PeerPhysicalPath_class;
|
|
jclass PeerRole_class;
|
|
jclass Peer_class;
|
|
jclass ResultCode_class;
|
|
jclass Version_class;
|
|
jclass VirtualNetworkConfigListener_class;
|
|
jclass VirtualNetworkConfigOperation_class;
|
|
jclass VirtualNetworkConfig_class;
|
|
jclass VirtualNetworkDNS_class;
|
|
jclass VirtualNetworkFrameListener_class;
|
|
jclass VirtualNetworkRoute_class;
|
|
jclass VirtualNetworkStatus_class;
|
|
jclass VirtualNetworkType_class;
|
|
|
|
//
|
|
// Instance methods
|
|
//
|
|
|
|
jmethodID ArrayList_add_method;
|
|
jmethodID ArrayList_ctor;
|
|
jmethodID DataStoreGetListener_onDataStoreGet_method;
|
|
jmethodID DataStorePutListener_onDataStorePut_method;
|
|
jmethodID DataStorePutListener_onDelete_method;
|
|
jmethodID EventListener_onEvent_method;
|
|
jmethodID EventListener_onTrace_method;
|
|
jmethodID InetAddress_getAddress_method;
|
|
jmethodID InetSocketAddress_ctor;
|
|
jmethodID InetSocketAddress_getAddress_method;
|
|
jmethodID InetSocketAddress_getPort_method;
|
|
jmethodID NodeStatus_ctor;
|
|
jmethodID PacketSender_onSendPacketRequested_method;
|
|
jmethodID PathChecker_onPathCheck_method;
|
|
jmethodID PathChecker_onPathLookup_method;
|
|
jmethodID PeerPhysicalPath_ctor;
|
|
jmethodID Peer_ctor;
|
|
jmethodID Version_ctor;
|
|
jmethodID VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method;
|
|
jmethodID VirtualNetworkConfig_ctor;
|
|
jmethodID VirtualNetworkDNS_ctor;
|
|
jmethodID VirtualNetworkFrameListener_onVirtualNetworkFrame_method;
|
|
jmethodID VirtualNetworkRoute_ctor;
|
|
|
|
//
|
|
// Static methods
|
|
//
|
|
|
|
jmethodID Event_fromInt_method;
|
|
jmethodID InetAddress_getByAddress_method;
|
|
jmethodID PeerRole_fromInt_method;
|
|
jmethodID ResultCode_fromInt_method;
|
|
jmethodID VirtualNetworkConfigOperation_fromInt_method;
|
|
jmethodID VirtualNetworkStatus_fromInt_method;
|
|
jmethodID VirtualNetworkType_fromInt_method;
|
|
|
|
//
|
|
// Enums
|
|
//
|
|
|
|
jobject ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
|
|
jobject ResultCode_RESULT_OK_enum;
|
|
|
|
void setupJNICache(JavaVM *vm) {
|
|
|
|
JNIEnv *env;
|
|
GETENV(env, vm);
|
|
|
|
//
|
|
// Classes
|
|
//
|
|
|
|
SETCLASS(ArrayList_class, "java/util/ArrayList");
|
|
SETCLASS(DataStoreGetListener_class, "com/zerotier/sdk/DataStoreGetListener");
|
|
SETCLASS(DataStorePutListener_class, "com/zerotier/sdk/DataStorePutListener");
|
|
SETCLASS(EventListener_class, "com/zerotier/sdk/EventListener");
|
|
SETCLASS(Event_class, "com/zerotier/sdk/Event");
|
|
SETCLASS(Inet4Address_class, "java/net/Inet4Address");
|
|
SETCLASS(Inet6Address_class, "java/net/Inet6Address");
|
|
SETCLASS(InetAddress_class, "java/net/InetAddress");
|
|
SETCLASS(InetSocketAddress_class, "java/net/InetSocketAddress");
|
|
SETCLASS(NodeStatus_class, "com/zerotier/sdk/NodeStatus");
|
|
SETCLASS(Node_class, "com/zerotier/sdk/Node");
|
|
SETCLASS(PacketSender_class, "com/zerotier/sdk/PacketSender");
|
|
SETCLASS(PathChecker_class, "com/zerotier/sdk/PathChecker");
|
|
SETCLASS(PeerPhysicalPath_class, "com/zerotier/sdk/PeerPhysicalPath");
|
|
SETCLASS(PeerRole_class, "com/zerotier/sdk/PeerRole");
|
|
SETCLASS(Peer_class, "com/zerotier/sdk/Peer");
|
|
SETCLASS(ResultCode_class, "com/zerotier/sdk/ResultCode");
|
|
SETCLASS(Version_class, "com/zerotier/sdk/Version");
|
|
SETCLASS(VirtualNetworkConfigListener_class, "com/zerotier/sdk/VirtualNetworkConfigListener");
|
|
SETCLASS(VirtualNetworkConfigOperation_class, "com/zerotier/sdk/VirtualNetworkConfigOperation");
|
|
SETCLASS(VirtualNetworkConfig_class, "com/zerotier/sdk/VirtualNetworkConfig");
|
|
SETCLASS(VirtualNetworkDNS_class, "com/zerotier/sdk/VirtualNetworkDNS");
|
|
SETCLASS(VirtualNetworkFrameListener_class, "com/zerotier/sdk/VirtualNetworkFrameListener");
|
|
SETCLASS(VirtualNetworkRoute_class, "com/zerotier/sdk/VirtualNetworkRoute");
|
|
SETCLASS(VirtualNetworkStatus_class, "com/zerotier/sdk/VirtualNetworkStatus");
|
|
SETCLASS(VirtualNetworkType_class, "com/zerotier/sdk/VirtualNetworkType");
|
|
|
|
//
|
|
// Instance methods
|
|
//
|
|
|
|
EXCEPTIONANDNULLCHECK(ArrayList_add_method = env->GetMethodID(ArrayList_class, "add", "(Ljava/lang/Object;)Z"));
|
|
EXCEPTIONANDNULLCHECK(ArrayList_ctor = env->GetMethodID(ArrayList_class, "<init>", "(I)V"));
|
|
EXCEPTIONANDNULLCHECK(DataStoreGetListener_onDataStoreGet_method = env->GetMethodID(DataStoreGetListener_class, "onDataStoreGet", "(Ljava/lang/String;[B)J"));
|
|
EXCEPTIONANDNULLCHECK(DataStorePutListener_onDataStorePut_method = env->GetMethodID(DataStorePutListener_class, "onDataStorePut", "(Ljava/lang/String;[BZ)I"));
|
|
EXCEPTIONANDNULLCHECK(DataStorePutListener_onDelete_method = env->GetMethodID(DataStorePutListener_class, "onDelete", "(Ljava/lang/String;)I"));
|
|
EXCEPTIONANDNULLCHECK(EventListener_onEvent_method = env->GetMethodID(EventListener_class, "onEvent", "(Lcom/zerotier/sdk/Event;)V"));
|
|
EXCEPTIONANDNULLCHECK(EventListener_onTrace_method = env->GetMethodID(EventListener_class, "onTrace", "(Ljava/lang/String;)V"));
|
|
EXCEPTIONANDNULLCHECK(InetAddress_getAddress_method = env->GetMethodID(InetAddress_class, "getAddress", "()[B"));
|
|
EXCEPTIONANDNULLCHECK(InetSocketAddress_ctor = env->GetMethodID(InetSocketAddress_class, "<init>", "(Ljava/net/InetAddress;I)V"));
|
|
EXCEPTIONANDNULLCHECK(InetSocketAddress_getAddress_method = env->GetMethodID(InetSocketAddress_class, "getAddress", "()Ljava/net/InetAddress;"));
|
|
EXCEPTIONANDNULLCHECK(InetSocketAddress_getPort_method = env->GetMethodID(InetSocketAddress_class, "getPort", "()I"));
|
|
EXCEPTIONANDNULLCHECK(NodeStatus_ctor = env->GetMethodID(NodeStatus_class, "<init>", "(JLjava/lang/String;Ljava/lang/String;Z)V"));
|
|
EXCEPTIONANDNULLCHECK(PacketSender_onSendPacketRequested_method = env->GetMethodID(PacketSender_class, "onSendPacketRequested", "(JLjava/net/InetSocketAddress;[BI)I"));
|
|
EXCEPTIONANDNULLCHECK(PathChecker_onPathCheck_method = env->GetMethodID(PathChecker_class, "onPathCheck", "(JJLjava/net/InetSocketAddress;)Z"));
|
|
EXCEPTIONANDNULLCHECK(PathChecker_onPathLookup_method = env->GetMethodID(PathChecker_class, "onPathLookup", "(JI)Ljava/net/InetSocketAddress;"));
|
|
EXCEPTIONANDNULLCHECK(PeerPhysicalPath_ctor = env->GetMethodID(PeerPhysicalPath_class, "<init>", "(Ljava/net/InetSocketAddress;JJZ)V"));
|
|
EXCEPTIONANDNULLCHECK(Peer_ctor = env->GetMethodID(Peer_class, "<init>", "(JIIIILcom/zerotier/sdk/PeerRole;[Lcom/zerotier/sdk/PeerPhysicalPath;)V"));
|
|
EXCEPTIONANDNULLCHECK(Version_ctor = env->GetMethodID(Version_class, "<init>", "(III)V"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method = env->GetMethodID(VirtualNetworkConfigListener_class, "onNetworkConfigurationUpdated", "(JLcom/zerotier/sdk/VirtualNetworkConfigOperation;Lcom/zerotier/sdk/VirtualNetworkConfig;)I"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkConfig_ctor = env->GetMethodID(VirtualNetworkConfig_class, "<init>", "(JJLjava/lang/String;Lcom/zerotier/sdk/VirtualNetworkStatus;Lcom/zerotier/sdk/VirtualNetworkType;IZZZIJ[Ljava/net/InetSocketAddress;[Lcom/zerotier/sdk/VirtualNetworkRoute;Lcom/zerotier/sdk/VirtualNetworkDNS;)V"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkDNS_ctor = env->GetMethodID(VirtualNetworkDNS_class, "<init>", "(Ljava/lang/String;Ljava/util/ArrayList;)V"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkFrameListener_onVirtualNetworkFrame_method = env->GetMethodID(VirtualNetworkFrameListener_class, "onVirtualNetworkFrame", "(JJJJJ[B)V"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkRoute_ctor = env->GetMethodID(VirtualNetworkRoute_class, "<init>", "(Ljava/net/InetSocketAddress;Ljava/net/InetSocketAddress;II)V"));
|
|
|
|
//
|
|
// Static methods
|
|
//
|
|
|
|
EXCEPTIONANDNULLCHECK(Event_fromInt_method = env->GetStaticMethodID(Event_class, "fromInt", "(I)Lcom/zerotier/sdk/Event;"));
|
|
EXCEPTIONANDNULLCHECK(InetAddress_getByAddress_method = env->GetStaticMethodID(InetAddress_class, "getByAddress", "([B)Ljava/net/InetAddress;"));
|
|
EXCEPTIONANDNULLCHECK(PeerRole_fromInt_method = env->GetStaticMethodID(PeerRole_class, "fromInt", "(I)Lcom/zerotier/sdk/PeerRole;"));
|
|
EXCEPTIONANDNULLCHECK(ResultCode_fromInt_method = env->GetStaticMethodID(ResultCode_class, "fromInt", "(I)Lcom/zerotier/sdk/ResultCode;"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkConfigOperation_fromInt_method = env->GetStaticMethodID(VirtualNetworkConfigOperation_class, "fromInt", "(I)Lcom/zerotier/sdk/VirtualNetworkConfigOperation;"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkStatus_fromInt_method = env->GetStaticMethodID(VirtualNetworkStatus_class, "fromInt", "(I)Lcom/zerotier/sdk/VirtualNetworkStatus;"));
|
|
EXCEPTIONANDNULLCHECK(VirtualNetworkType_fromInt_method = env->GetStaticMethodID(VirtualNetworkType_class, "fromInt", "(I)Lcom/zerotier/sdk/VirtualNetworkType;"));
|
|
|
|
//
|
|
// Enums
|
|
//
|
|
|
|
SETOBJECT(ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum, createResultObject(env, ZT_RESULT_FATAL_ERROR_INTERNAL));
|
|
SETOBJECT(ResultCode_RESULT_OK_enum, createResultObject(env, ZT_RESULT_OK));
|
|
}
|
|
|
|
void teardownJNICache(JavaVM *vm) {
|
|
|
|
JNIEnv *env;
|
|
GETENV(env, vm);
|
|
|
|
env->DeleteGlobalRef(ArrayList_class);
|
|
env->DeleteGlobalRef(DataStoreGetListener_class);
|
|
env->DeleteGlobalRef(DataStorePutListener_class);
|
|
env->DeleteGlobalRef(EventListener_class);
|
|
env->DeleteGlobalRef(Event_class);
|
|
env->DeleteGlobalRef(InetAddress_class);
|
|
env->DeleteGlobalRef(InetSocketAddress_class);
|
|
env->DeleteGlobalRef(NodeStatus_class);
|
|
env->DeleteGlobalRef(Node_class);
|
|
env->DeleteGlobalRef(PacketSender_class);
|
|
env->DeleteGlobalRef(PathChecker_class);
|
|
env->DeleteGlobalRef(PeerPhysicalPath_class);
|
|
env->DeleteGlobalRef(PeerRole_class);
|
|
env->DeleteGlobalRef(Peer_class);
|
|
env->DeleteGlobalRef(ResultCode_class);
|
|
env->DeleteGlobalRef(Version_class);
|
|
env->DeleteGlobalRef(VirtualNetworkConfigListener_class);
|
|
env->DeleteGlobalRef(VirtualNetworkConfigOperation_class);
|
|
env->DeleteGlobalRef(VirtualNetworkConfig_class);
|
|
env->DeleteGlobalRef(VirtualNetworkDNS_class);
|
|
env->DeleteGlobalRef(VirtualNetworkFrameListener_class);
|
|
env->DeleteGlobalRef(VirtualNetworkRoute_class);
|
|
env->DeleteGlobalRef(VirtualNetworkStatus_class);
|
|
env->DeleteGlobalRef(VirtualNetworkType_class);
|
|
|
|
env->DeleteGlobalRef(ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum);
|
|
env->DeleteGlobalRef(ResultCode_RESULT_OK_enum);
|
|
}
|