1.10.4 merge into main (#1893)
* 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 032dc5c108.
* 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>
This commit is contained in:
Adam Ierymenko
GitHub
parent
dea47f601d
commit
1c5897895b
13322 changed files with 3150 additions and 3572096 deletions
|
|
@ -1,112 +0,0 @@
|
|||
//
|
||||
// Created by Grant Limberg on 10/21/20.
|
||||
//
|
||||
|
||||
#include "ZT_jniarray.h"
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <cassert>
|
||||
|
||||
jclass java_util_ArrayList;
|
||||
jmethodID java_util_ArrayList_;
|
||||
jmethodID java_util_ArrayList_size;
|
||||
jmethodID java_util_ArrayList_get;
|
||||
jmethodID java_util_ArrayList_add;
|
||||
|
||||
void InitListJNI(JNIEnv* env) {
|
||||
java_util_ArrayList = static_cast<jclass>(env->NewGlobalRef(env->FindClass("java/util/ArrayList")));
|
||||
java_util_ArrayList_ = env->GetMethodID(java_util_ArrayList, "<init>", "(I)V");
|
||||
java_util_ArrayList_size = env->GetMethodID (java_util_ArrayList, "size", "()I");
|
||||
java_util_ArrayList_get = env->GetMethodID(java_util_ArrayList, "get", "(I)Ljava/lang/Object;");
|
||||
java_util_ArrayList_add = env->GetMethodID(java_util_ArrayList, "add", "(Ljava/lang/Object;)Z");
|
||||
}
|
||||
|
||||
jclass ListJNI::getListClass(JNIEnv* env) {
|
||||
jclass jclazz = env->FindClass("java/util/List");
|
||||
assert(jclazz != nullptr);
|
||||
return jclazz;
|
||||
}
|
||||
|
||||
jclass ListJNI::getArrayListClass(JNIEnv* env) {
|
||||
jclass jclazz = env->FindClass("java/util/ArrayList");
|
||||
assert(jclazz != nullptr);
|
||||
return jclazz;
|
||||
}
|
||||
|
||||
jclass ListJNI::getIteratorClass(JNIEnv* env) {
|
||||
jclass jclazz = env->FindClass("java/util/Iterator");
|
||||
assert(jclazz != nullptr);
|
||||
return jclazz;
|
||||
}
|
||||
|
||||
jmethodID ListJNI::getIteratorMethod(JNIEnv* env) {
|
||||
static jmethodID mid = env->GetMethodID(
|
||||
getListClass(env), "iterator", "()Ljava/util/Iterator;");
|
||||
assert(mid != nullptr);
|
||||
return mid;
|
||||
}
|
||||
|
||||
jmethodID ListJNI::getHasNextMethod(JNIEnv* env) {
|
||||
static jmethodID mid = env->GetMethodID(
|
||||
getIteratorClass(env), "hasNext", "()Z");
|
||||
assert(mid != nullptr);
|
||||
return mid;
|
||||
}
|
||||
|
||||
jmethodID ListJNI::getNextMethod(JNIEnv* env) {
|
||||
static jmethodID mid = env->GetMethodID(
|
||||
getIteratorClass(env), "next", "()Ljava/lang/Object;");
|
||||
assert(mid != nullptr);
|
||||
return mid;
|
||||
}
|
||||
|
||||
jmethodID ListJNI::getArrayListConstructorMethodId(JNIEnv* env, jclass jclazz) {
|
||||
static jmethodID mid = env->GetMethodID(
|
||||
jclazz, "<init>", "(I)V");
|
||||
assert(mid != nullptr);
|
||||
return mid;
|
||||
}
|
||||
|
||||
jmethodID ListJNI::getListAddMethodId(JNIEnv* env) {
|
||||
static jmethodID mid = env->GetMethodID(
|
||||
getListClass(env), "add", "(Ljava/lang/Object;)Z");
|
||||
assert(mid != nullptr);
|
||||
return mid;
|
||||
}
|
||||
|
||||
jclass ByteJNI::getByteClass(JNIEnv* env) {
|
||||
jclass jclazz = env->FindClass("java/lang/Byte");
|
||||
assert(jclazz != nullptr);
|
||||
return jclazz;
|
||||
}
|
||||
|
||||
jmethodID ByteJNI::getByteValueMethod(JNIEnv* env) {
|
||||
static jmethodID mid = env->GetMethodID(
|
||||
getByteClass(env), "byteValue", "()B");
|
||||
assert(mid != nullptr);
|
||||
return mid;
|
||||
}
|
||||
|
||||
jobject cppToJava(JNIEnv* env, std::vector<std::string> vector) {
|
||||
jobject result = env->NewObject(java_util_ArrayList, java_util_ArrayList_, vector.size());
|
||||
for (std::string s: vector) {
|
||||
jstring element = env->NewStringUTF(s.c_str());
|
||||
env->CallBooleanMethod(result, java_util_ArrayList_add, element);
|
||||
env->DeleteLocalRef(element);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
std::vector<std::string> javaToCpp(JNIEnv* env, jobject arrayList) {
|
||||
jint len = env->CallIntMethod(arrayList, java_util_ArrayList_size);
|
||||
std::vector<std::string> result;
|
||||
result.reserve(len);
|
||||
for (jint i=0; i<len; i++) {
|
||||
jstring element = static_cast<jstring>(env->CallObjectMethod(arrayList, java_util_ArrayList_get, i));
|
||||
const char* pchars = env->GetStringUTFChars(element, nullptr);
|
||||
result.emplace_back(pchars);
|
||||
env->ReleaseStringUTFChars(element, pchars);
|
||||
env->DeleteLocalRef(element);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
//
|
||||
// Created by Grant Limberg on 10/21/20.
|
||||
//
|
||||
|
||||
#ifndef ZEROTIERANDROID_ZT_JNIARRAY_H
|
||||
#define ZEROTIERANDROID_ZT_JNIARRAY_H
|
||||
|
||||
#include <jni.h>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
extern jclass java_util_ArrayList;
|
||||
extern jmethodID java_util_ArrayList_;
|
||||
extern jmethodID java_util_ArrayList_size;
|
||||
extern jmethodID java_util_ArrayList_get;
|
||||
extern jmethodID java_util_ArrayList_add;
|
||||
|
||||
void InitListJNI(JNIEnv* env);
|
||||
|
||||
class ListJNI {
|
||||
public:
|
||||
// Get the java class id of java.util.List.
|
||||
static jclass getListClass(JNIEnv* env);
|
||||
|
||||
// Get the java class id of java.util.ArrayList.
|
||||
static jclass getArrayListClass(JNIEnv* env);
|
||||
|
||||
// Get the java class id of java.util.Iterator.
|
||||
static jclass getIteratorClass(JNIEnv* env);
|
||||
|
||||
// Get the java method id of java.util.List.iterator().
|
||||
static jmethodID getIteratorMethod(JNIEnv* env);
|
||||
|
||||
// Get the java method id of java.util.Iterator.hasNext().
|
||||
static jmethodID getHasNextMethod(JNIEnv* env);
|
||||
|
||||
// Get the java method id of java.util.Iterator.next().
|
||||
static jmethodID getNextMethod(JNIEnv* env);
|
||||
|
||||
// Get the java method id of arrayList constructor.
|
||||
static jmethodID getArrayListConstructorMethodId(JNIEnv* env, jclass jclazz);
|
||||
|
||||
// Get the java method id of java.util.List.add().
|
||||
static jmethodID getListAddMethodId(JNIEnv* env);
|
||||
};
|
||||
|
||||
class ByteJNI {
|
||||
public:
|
||||
// Get the java class id of java.lang.Byte.
|
||||
static jclass getByteClass(JNIEnv* env);
|
||||
|
||||
// Get the java method id of java.lang.Byte.byteValue.
|
||||
static jmethodID getByteValueMethod(JNIEnv* env);
|
||||
};
|
||||
|
||||
jobject cppToJava(JNIEnv* env, std::vector<std::string> vector);
|
||||
|
||||
std::vector<std::string> javaToCpp(JNIEnv* env, jobject arrayList);
|
||||
|
||||
#endif //ZEROTIERANDROID_ZT_JNIARRAY_H
|
||||
244
java/jni/ZT_jnicache.cpp
Normal file
244
java/jni/ZT_jnicache.cpp
Normal file
|
|
@ -0,0 +1,244 @@
|
|||
//
|
||||
// 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"));
|
||||
|
||||
|
||||
//
|
||||
// ANDROID-56: temporarily remove parameters to prevent crashing
|
||||
//
|
||||
// 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(VirtualNetworkConfig_ctor = env->GetMethodID(VirtualNetworkConfig_class, "<init>", "(JJLjava/lang/String;Lcom/zerotier/sdk/VirtualNetworkStatus;Lcom/zerotier/sdk/VirtualNetworkType;IZZZ[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);
|
||||
}
|
||||
92
java/jni/ZT_jnicache.h
Normal file
92
java/jni/ZT_jnicache.h
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
//
|
||||
// Created by Brenton Bostick on 1/18/23.
|
||||
//
|
||||
|
||||
#ifndef ZEROTIERANDROID_JNICACHE_H
|
||||
#define ZEROTIERANDROID_JNICACHE_H
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
|
||||
//
|
||||
// Classes
|
||||
//
|
||||
|
||||
extern jclass ArrayList_class;
|
||||
extern jclass DataStoreGetListener_class;
|
||||
extern jclass DataStorePutListener_class;
|
||||
extern jclass EventListener_class;
|
||||
extern jclass Event_class;
|
||||
extern jclass Inet4Address_class;
|
||||
extern jclass Inet6Address_class;
|
||||
extern jclass InetAddress_class;
|
||||
extern jclass InetSocketAddress_class;
|
||||
extern jclass NodeStatus_class;
|
||||
extern jclass Node_class;
|
||||
extern jclass PacketSender_class;
|
||||
extern jclass PathChecker_class;
|
||||
extern jclass PeerPhysicalPath_class;
|
||||
extern jclass PeerRole_class;
|
||||
extern jclass Peer_class;
|
||||
extern jclass ResultCode_class;
|
||||
extern jclass Version_class;
|
||||
extern jclass VirtualNetworkConfigListener_class;
|
||||
extern jclass VirtualNetworkConfigOperation_class;
|
||||
extern jclass VirtualNetworkConfig_class;
|
||||
extern jclass VirtualNetworkDNS_class;
|
||||
extern jclass VirtualNetworkFrameListener_class;
|
||||
extern jclass VirtualNetworkRoute_class;
|
||||
extern jclass VirtualNetworkStatus_class;
|
||||
extern jclass VirtualNetworkType_class;
|
||||
|
||||
//
|
||||
// Instance methods
|
||||
//
|
||||
|
||||
extern jmethodID ArrayList_add_method;
|
||||
extern jmethodID ArrayList_ctor;
|
||||
extern jmethodID DataStoreGetListener_onDataStoreGet_method;
|
||||
extern jmethodID DataStorePutListener_onDataStorePut_method;
|
||||
extern jmethodID DataStorePutListener_onDelete_method;
|
||||
extern jmethodID EventListener_onEvent_method;
|
||||
extern jmethodID EventListener_onTrace_method;
|
||||
extern jmethodID InetAddress_getAddress_method;
|
||||
extern jmethodID InetSocketAddress_ctor;
|
||||
extern jmethodID InetSocketAddress_getAddress_method;
|
||||
extern jmethodID InetSocketAddress_getPort_method;
|
||||
extern jmethodID NodeStatus_ctor;
|
||||
extern jmethodID PacketSender_onSendPacketRequested_method;
|
||||
extern jmethodID PathChecker_onPathCheck_method;
|
||||
extern jmethodID PathChecker_onPathLookup_method;
|
||||
extern jmethodID PeerPhysicalPath_ctor;
|
||||
extern jmethodID Peer_ctor;
|
||||
extern jmethodID Version_ctor;
|
||||
extern jmethodID VirtualNetworkConfigListener_onNetworkConfigurationUpdated_method;
|
||||
extern jmethodID VirtualNetworkConfig_ctor;
|
||||
extern jmethodID VirtualNetworkDNS_ctor;
|
||||
extern jmethodID VirtualNetworkFrameListener_onVirtualNetworkFrame_method;
|
||||
extern jmethodID VirtualNetworkRoute_ctor;
|
||||
|
||||
//
|
||||
// Static methods
|
||||
//
|
||||
|
||||
extern jmethodID Event_fromInt_method;
|
||||
extern jmethodID InetAddress_getByAddress_method;
|
||||
extern jmethodID PeerRole_fromInt_method;
|
||||
extern jmethodID ResultCode_fromInt_method;
|
||||
extern jmethodID VirtualNetworkConfigOperation_fromInt_method;
|
||||
extern jmethodID VirtualNetworkStatus_fromInt_method;
|
||||
extern jmethodID VirtualNetworkType_fromInt_method;
|
||||
|
||||
//
|
||||
// Enums
|
||||
//
|
||||
|
||||
extern jobject ResultCode_RESULT_FATAL_ERROR_INTERNAL_enum;
|
||||
extern jobject ResultCode_RESULT_OK_enum;
|
||||
|
||||
void setupJNICache(JavaVM *vm);
|
||||
void teardownJNICache(JavaVM *vm);
|
||||
|
||||
#endif // ZEROTIERANDROID_JNICACHE_H
|
||||
|
|
@ -1,158 +0,0 @@
|
|||
/*
|
||||
* ZeroTier One - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||
*
|
||||
* 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/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||
*
|
||||
* If you would like to embed ZeroTier into a commercial application or
|
||||
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||
* LLC. Start here: http://www.zerotier.com/
|
||||
*/
|
||||
|
||||
#include "ZT_jnilookup.h"
|
||||
#include "ZT_jniutils.h"
|
||||
|
||||
JniLookup::JniLookup()
|
||||
: m_jvm(NULL)
|
||||
{
|
||||
LOGV("JNI Cache Created");
|
||||
}
|
||||
|
||||
JniLookup::JniLookup(JavaVM *jvm)
|
||||
: m_jvm(jvm)
|
||||
{
|
||||
LOGV("JNI Cache Created");
|
||||
}
|
||||
|
||||
JniLookup::~JniLookup()
|
||||
{
|
||||
LOGV("JNI Cache Destroyed");
|
||||
}
|
||||
|
||||
|
||||
void JniLookup::setJavaVM(JavaVM *jvm)
|
||||
{
|
||||
LOGV("Assigned JVM to object");
|
||||
m_jvm = jvm;
|
||||
}
|
||||
|
||||
|
||||
jclass JniLookup::findClass(const std::string &name)
|
||||
{
|
||||
if(!m_jvm)
|
||||
return NULL;
|
||||
|
||||
// get the class from the JVM
|
||||
JNIEnv *env = NULL;
|
||||
if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
|
||||
{
|
||||
LOGE("Error retrieving JNI Environment");
|
||||
return NULL;
|
||||
}
|
||||
const char *c = name.c_str();
|
||||
jclass cls = env->FindClass(c);
|
||||
if(env->ExceptionCheck())
|
||||
{
|
||||
LOGE("Error finding class: %s", name.c_str());
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return cls;
|
||||
}
|
||||
|
||||
|
||||
jmethodID JniLookup::findMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
|
||||
{
|
||||
if(!m_jvm)
|
||||
return NULL;
|
||||
|
||||
JNIEnv *env = NULL;
|
||||
if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
jmethodID mid = env->GetMethodID(cls, methodName.c_str(), methodSig.c_str());
|
||||
if(env->ExceptionCheck())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return mid;
|
||||
}
|
||||
|
||||
jmethodID JniLookup::findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
|
||||
{
|
||||
if(!m_jvm)
|
||||
return NULL;
|
||||
|
||||
JNIEnv *env = NULL;
|
||||
if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
jmethodID mid = env->GetStaticMethodID(cls, methodName.c_str(), methodSig.c_str());
|
||||
if(env->ExceptionCheck())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return mid;
|
||||
}
|
||||
|
||||
jfieldID JniLookup::findField(jclass cls, const std::string &fieldName, const std::string &typeStr)
|
||||
{
|
||||
if(!m_jvm)
|
||||
return NULL;
|
||||
|
||||
JNIEnv *env = NULL;
|
||||
if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
jfieldID fid = env->GetFieldID(cls, fieldName.c_str(), typeStr.c_str());
|
||||
if(env->ExceptionCheck())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return fid;
|
||||
}
|
||||
|
||||
jfieldID JniLookup::findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr)
|
||||
{
|
||||
if(!m_jvm)
|
||||
return NULL;
|
||||
|
||||
JNIEnv *env = NULL;
|
||||
if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
jfieldID fid = env->GetStaticFieldID(cls, fieldName.c_str(), typeStr.c_str());
|
||||
if(env->ExceptionCheck())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return fid;
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
/*
|
||||
* ZeroTier One - Network Virtualization Everywhere
|
||||
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||
*
|
||||
* 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/>.
|
||||
*
|
||||
* --
|
||||
*
|
||||
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||
*
|
||||
* If you would like to embed ZeroTier into a commercial application or
|
||||
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||
* LLC. Start here: http://www.zerotier.com/
|
||||
*/
|
||||
|
||||
#ifndef ZT_JNILOOKUP_H_
|
||||
#define ZT_JNILOOKUP_H_
|
||||
|
||||
#include <jni.h>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
|
||||
|
||||
class JniLookup {
|
||||
public:
|
||||
JniLookup();
|
||||
JniLookup(JavaVM *jvm);
|
||||
~JniLookup();
|
||||
|
||||
void setJavaVM(JavaVM *jvm);
|
||||
|
||||
jclass findClass(const std::string &name);
|
||||
jmethodID findMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
|
||||
jmethodID findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
|
||||
jfieldID findField(jclass cls, const std::string &fieldName, const std::string &typeStr);
|
||||
jfieldID findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr);
|
||||
private:
|
||||
JavaVM *m_jvm;
|
||||
};
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -15,18 +15,15 @@
|
|||
* 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>
|
||||
|
||||
#include <jni.h>
|
||||
#include <ZeroTierOne.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define LOG_TAG "ZeroTierOneJNI"
|
||||
#include <limits> // for numeric_limits
|
||||
#include <sys/socket.h> // for sockaddr_storage
|
||||
|
||||
#if defined(__ANDROID__)
|
||||
|
||||
|
|
@ -55,6 +52,34 @@ extern "C" {
|
|||
#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);
|
||||
|
|
@ -64,8 +89,7 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT_VirtualNetworkConfig
|
|||
|
||||
jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr);
|
||||
jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr);
|
||||
|
||||
jobject newMulticastGroup(JNIEnv *env, const ZT_MulticastGroup &mc);
|
||||
int addressPort(const sockaddr_storage addr);
|
||||
|
||||
jobject newPeer(JNIEnv *env, const ZT_Peer &peer);
|
||||
jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp);
|
||||
|
|
@ -78,8 +102,68 @@ jobject newVirtualNetworkRoute(JNIEnv *env, const ZT_VirtualNetworkRoute &route)
|
|||
|
||||
jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
jobject newNodeStatus(JNIEnv *env, const ZT_NodeStatus &status);
|
||||
|
||||
#endif
|
||||
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_
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -10,9 +10,17 @@ extern "C" {
|
|||
/*
|
||||
* Class: com_zerotier_sdk_Node
|
||||
* Method: node_init
|
||||
* Signature: (J)Lcom/zerotier/sdk/ResultCode;
|
||||
* Signature: (JLcom/zerotier/sdk/DataStoreGetListener;Lcom/zerotier/sdk/DataStorePutListener;Lcom/zerotier/sdk/PacketSender;Lcom/zerotier/sdk/EventListener;Lcom/zerotier/sdk/VirtualNetworkFrameListener;Lcom/zerotier/sdk/VirtualNetworkConfigListener;Lcom/zerotier/sdk/PathChecker;)Lcom/zerotier/sdk/ResultCode;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init
|
||||
(JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jobject, jobject, jobject);
|
||||
|
||||
/*
|
||||
* Class: com_zerotier_sdk_Node
|
||||
* Method: node_isInited
|
||||
* Signature: (J)Z;
|
||||
*/
|
||||
JNIEXPORT jboolean JNICALL Java_com_zerotier_sdk_Node_node_1isInited
|
||||
(JNIEnv *, jobject, jlong);
|
||||
|
||||
/*
|
||||
|
|
@ -34,7 +42,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame
|
|||
/*
|
||||
* Class: com_zerotier_sdk_Node
|
||||
* Method: processWirePacket
|
||||
* Signature: (JJLjava/net/InetSockAddress;Ljava/net/InetSockAddress;[B[J)Lcom/zerotier/sdk/ResultCode;
|
||||
* Signature: (JJJLjava/net/InetSockAddress;[B[J)Lcom/zerotier/sdk/ResultCode;
|
||||
*/
|
||||
JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket
|
||||
(JNIEnv *, jobject, jlong, jlong, jlong, jobject, jbyteArray, jlongArray);
|
||||
|
|
@ -121,10 +129,10 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_peers
|
|||
|
||||
/*
|
||||
* Class: com_zerotier_sdk_Node
|
||||
* Method: networks
|
||||
* Method: networkConfigs
|
||||
* Signature: (J)[Lcom/zerotier/sdk/VirtualNetworkConfig;
|
||||
*/
|
||||
JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networks
|
||||
JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networkConfigs
|
||||
(JNIEnv *, jobject, jlong);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue