ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-01 15:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Grant Limberg 2015-07-01 18:13:39 -07:00
parent d853dbf2d8
commit f803dd5ff4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/build.xml
View File

@ -42,6 +42,7 @@
<exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true"> <exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
<arg value="ZT1=${env.ZT}"/> <arg value="ZT1=${env.ZT}"/>
<arg value="V=1"/> <arg value="V=1"/>
<!-- <arg value="NDK_DEBUG=1"/> -->
</exec> </exec>
<copy file="libs/arm64-v8a/libZeroTierOneJNI.so" <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so" tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"

1
java/jni/Android.mk
View File

@ -5,6 +5,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := ZeroTierOneJNI LOCAL_MODULE := ZeroTierOneJNI
LOCAL_C_INCLUDES := $(ZT1)/include LOCAL_C_INCLUDES := $(ZT1)/include
LOCAL_LDLIBS := -llog LOCAL_LDLIBS := -llog
# LOCAL_CFLAGS := -g
# ZeroTierOne SDK source files # ZeroTierOne SDK source files
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \

8
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -192,7 +192,11 @@ namespace {
{ {
LOGV("EventCallback"); LOGV("EventCallback");
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); if(ref->node != node)
{
LOGE("Nodes not equal. ref->node %p, node %p", ref->node, node);
return;
}
JNIEnv *env = NULL; JNIEnv *env = NULL;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
@ -613,6 +617,8 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
&VirtualNetworkConfigFunctionCallback, &VirtualNetworkConfigFunctionCallback,
&EventCallback); &EventCallback);
LOGI("Node Created.");
if(rc != ZT1_RESULT_OK) if(rc != ZT1_RESULT_OK)
{ {
LOGE("Error creating Node: %d", rc); LOGE("Error creating Node: %d", rc);