gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor update to control api (and JNI). zts_start, zts_stop return int

Browse Source
This commit is contained in:
Joseph Henry
2019-02-28 15:47:49 -08:00
parent 916b9605a3
commit 0afa8e41fa
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Controls.cpp
View File

@@ -576,7 +576,7 @@ zts_err_t zts_start(const char *path, void (*callback)(struct zts_callback_msg*)
}
#ifdef SDK_JNI
JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_start(
JNIEXPORT int JNICALL Java_com_zerotier_libzt_ZeroTier_start(
JNIEnv *env, jobject thisObj, jstring path, jobject callback, jint port)
{
if (!path) {
@@ -595,8 +595,9 @@ JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_start(
objRef = env->NewGlobalRef(callback); // Reference used for later calls
_userCallbackMethodRef = eventListenerCallbackMethod;
const char* utf_string = env->GetStringUTFChars(path, NULL);
zts_start(utf_string, NULL, port); // using _userCallbackMethodRef
int retval = zts_start(utf_string, NULL, port); // using _userCallbackMethodRef
env->ReleaseStringUTFChars(path, utf_string);
return retval;
}
#endif