ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-20 09:46:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

freaking JNI

Browse Source
This commit is contained in:
Grant Limberg 2020-10-21 16:08:19 -07:00
parent fbbcf292c6
commit 3da8f5f053
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/jni/Android.mk
View File

@ -15,7 +15,7 @@ APP_UNIFIED_HEADERS := true
LOCAL_CFLAGS := -DZT_USE_MINIUPNPC
ifeq ($(TARGET_ARCH_ABI),x86_64)
LOCAL_CXXFLAGS := -maes -mpclmul -msse4.1
LOCAL_CXXFLAGS := -maes -mpclmul -msse3 -msse4.1
endif
ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_ARM_NEON := true
@ -25,6 +25,8 @@ endif
# ZeroTierOne SDK source files
LOCAL_SRC_FILES := \
$(ZT1)/node/AES.cpp \
$(ZT1)/node/AES_aesni.cpp \
$(ZT1)/node/AES_armcrypto.cpp \
$(ZT1)/node/Bond.cpp \
$(ZT1)/node/BondController.cpp \
$(ZT1)/node/C25519.cpp \

4
java/jni/ZT_jnilookup.cpp
View File

@ -65,8 +65,8 @@ jclass JniLookup::findClass(const std::string &name)
LOGE("Error retreiving JNI Environment");
return NULL;
}
jclass cls = env->FindClass(name.c_str());
const char *c = name.c_str();
jclass cls = env->FindClass(c);
if(env->ExceptionCheck())
{
LOGE("Error finding class: %s", name.c_str());

4
java/jni/ZT_jniutils.cpp
View File

@ -747,7 +747,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT_VirtualNetworkConfig &vnetConfig)
return NULL;
}
dnsField = lookup.findField(vnetConfigClass, "dns", "Lcom/zerotier/sdk/VirtualNetworkDNS");
dnsField = lookup.findField(vnetConfigClass, "dns", "Lcom/zerotier/sdk/VirtualNetworkDNS;");
if(env->ExceptionCheck() || dnsField == NULL)
{
LOGE("Error getting DNS field");
@ -995,7 +995,7 @@ jobject newVirtualNetworkDNS(JNIEnv *env, const ZT_VirtualNetworkDNS &dns)
return NULL;
}
serversField = lookup.findField(virtualNetworkDNSClass, "servers", "[Ljava/net/InetSocketAddress;");
serversField = lookup.findField(virtualNetworkDNSClass, "servers", "Ljava/util/ArrayList;");
if(env->ExceptionCheck() || serversField == NULL) {
return NULL;
}