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

Fixing Android/Java crash on boot due to missing init method (#70)

Browse Source 
* adding extern c to library methods to fix JNI crash on init

* changed style to use ifdef cplusplus
This commit is contained in:
rossmc7
2020-05-29 19:24:22 +01:00
committed by GitHub
parent 58ebf438d0
commit 3f1e9f00d1
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Controls.cpp
View File

@@ -36,6 +36,8 @@ using namespace ZeroTier;
#include <jni.h> #include <jni.h>
#endif #endif
namespace ZeroTier namespace ZeroTier
{ {
extern NodeService *service; extern NodeService *service;
@@ -153,6 +155,11 @@ int zts_start(const char *path, void (*callback)(void *), uint16_t port)
return retval; return retval;
} }
#ifdef __cplusplus
extern "C" {
#endif
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_start( JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_start(
JNIEnv *env, jobject thisObj, jstring path, jobject callback, jint port) JNIEnv *env, jobject thisObj, jstring path, jobject callback, jint port)
@@ -198,7 +205,7 @@ int zts_stop()
return ZTS_ERR_SERVICE; return ZTS_ERR_SERVICE;
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_stop( JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_stop(
JNIEnv *env, jobject thisObj) JNIEnv *env, jobject thisObj)
{ {
zts_stop(); zts_stop();
@@ -248,7 +255,7 @@ int zts_restart()
#endif #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(
JNIEnv *env, jobject thisObj) JNIEnv *env, jobject thisObj)
{ {
zts_restart(); zts_restart();
@@ -266,7 +273,7 @@ int zts_free()
// TODO: add stack shutdown logic // TODO: add stack shutdown logic
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_free( JNIEXPORT void JNICALL Java_com_zerotier_libzt_ZeroTier_free(
JNIEnv *env, jobject thisObj) JNIEnv *env, jobject thisObj)
{ {
zts_free(); zts_free();
@@ -282,7 +289,7 @@ uint64_t zts_get_node_id()
return service->getNode()->address(); return service->getNode()->address();
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jlong JNICALL Java_com_zerotier_libzt_ZeroTier_get_1node_1id( JNIEXPORT jlong JNICALL Java_com_zerotier_libzt_ZeroTier_get_1node_1id(
JNIEnv *env, jobject thisObj) JNIEnv *env, jobject thisObj)
{ {
return zts_get_node_id(); return zts_get_node_id();
@@ -298,7 +305,7 @@ int zts_get_node_status()
&& service->getNode()->online() ? ZTS_EVENT_NODE_ONLINE : ZTS_EVENT_NODE_OFFLINE; && service->getNode()->online() ? ZTS_EVENT_NODE_ONLINE : ZTS_EVENT_NODE_OFFLINE;
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_get_1node_1status( JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_get_1node_1status(
JNIEnv *env, jobject thisObj) JNIEnv *env, jobject thisObj)
{ {
return zts_get_node_status(); return zts_get_node_status();
@@ -323,7 +330,7 @@ int zts_get_network_status(uint64_t networkId)
return ZTS_ERR_NO_RESULT; return ZTS_ERR_NO_RESULT;
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_get_1network_1status( JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_get_1network_1status(
JNIEnv *env, jobject thisObj, jlong networkId) JNIEnv *env, jobject thisObj, jlong networkId)
{ {
return zts_get_network_status(networkId); return zts_get_network_status(networkId);
@@ -340,7 +347,7 @@ int zts_get_peer_status(uint64_t peerId)
return service->getPeerStatus(peerId); return service->getPeerStatus(peerId);
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jlong JNICALL Java_com_zerotier_libzt_ZeroTier_get_1peer_1status( JNIEXPORT jlong JNICALL Java_com_zerotier_libzt_ZeroTier_get_1peer_1status(
JNIEnv *env, jobject thisObj, jlong peerId) JNIEnv *env, jobject thisObj, jlong peerId)
{ {
return zts_get_peer_status(peerId); return zts_get_peer_status(peerId);
@@ -352,7 +359,7 @@ JNIEXPORT jlong JNICALL Java_com_zerotier_libzt_ZeroTier_get_1peer_1status(
* Called from Java, saves a static reference to the VM so it can be used * Called from Java, saves a static reference to the VM so it can be used
* later to call a user-specified callback method from C. * later to call a user-specified callback method from C.
*/ */
JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_init( JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_init(
JNIEnv *env, jobject thisObj) JNIEnv *env, jobject thisObj)
{ {
jint rs = env->GetJavaVM(&jvm); jint rs = env->GetJavaVM(&jvm);
@@ -372,13 +379,18 @@ int zts_join(const uint64_t nwid)
return ZTS_ERR_OK; return ZTS_ERR_OK;
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_join( JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_join(
JNIEnv *env, jobject thisObj, jlong nwid) JNIEnv *env, jobject thisObj, jlong nwid)
{ {
return zts_join((uint64_t)nwid); return zts_join((uint64_t)nwid);
} }
#endif #endif
#ifdef __cplusplus
}
#endif
int zts_leave(const uint64_t nwid) int zts_leave(const uint64_t nwid)
{ {
Mutex::Lock _l(serviceLock); Mutex::Lock _l(serviceLock);
@@ -391,7 +403,7 @@ int zts_leave(const uint64_t nwid)
return ZTS_ERR_OK; return ZTS_ERR_OK;
} }
#ifdef SDK_JNI #ifdef SDK_JNI
JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_leave( JNIEXPORT jint JNICALL Java_com_zerotier_libzt_ZeroTier_leave(
JNIEnv *env, jobject thisObj, jlong nwid) JNIEnv *env, jobject thisObj, jlong nwid)
{ {
return zts_leave((uint64_t)nwid); return zts_leave((uint64_t)nwid);
@@ -617,6 +629,9 @@ int zts_get_all_network_details(struct zts_network_details *nds, int *num)
#ifdef SDK_JNI #ifdef SDK_JNI
#endif #endif
void zts_delay_ms(long interval_ms) void zts_delay_ms(long interval_ms)
{ {
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
@@ -627,3 +642,7 @@ void zts_delay_ms(long interval_ms)
nanosleep(&sleepValue, NULL); nanosleep(&sleepValue, NULL);
#endif #endif
} }