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

Bugfix for JNI version of zts_restart()

Browse Source
This commit is contained in:
Joseph Henry
2019-03-27 17:09:30 -07:00
parent e8553c9907
commit 94d221a055
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Controls.cpp
View File

@@ -643,8 +643,12 @@ int zts_restart()
{ {
_service_lock.lock(); _service_lock.lock();
// Store callback references // Store callback references
#ifdef SDK_JNI
static jmethodID _tmpUserCallbackMethodRef = _userCallbackMethodRef;
#else
void (*_tmpUserEventCallbackFunc)(struct zts_callback_msg *); void (*_tmpUserEventCallbackFunc)(struct zts_callback_msg *);
_tmpUserEventCallbackFunc = _userEventCallbackFunc; _tmpUserEventCallbackFunc = _userEventCallbackFunc;
#endif
int tmpPort = _port; int tmpPort = _port;
std::string tmpPath = _path; std::string tmpPath = _path;
// Stop the service // Stop the service
@@ -664,7 +668,14 @@ int zts_restart()
while (service) { while (service) {
_api_sleep(ZTS_CALLBACK_PROCESSING_INTERVAL); _api_sleep(ZTS_CALLBACK_PROCESSING_INTERVAL);
} }
/* Some of the logic in Java_com_zerotier_libzt_ZeroTier_start
is replicated here */
#ifdef SDK_JNI
_userCallbackMethodRef = _tmpUserCallbackMethodRef;
return zts_start(tmpPath.c_str(), NULL, tmpPort);
#else
return zts_start(tmpPath.c_str(), _tmpUserEventCallbackFunc, tmpPort); return zts_start(tmpPath.c_str(), _tmpUserEventCallbackFunc, tmpPort);
#endif
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_restart( JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_restart(