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

use GETENV macro

Browse Source
This commit is contained in:
Brenton Bostick 2023-02-02 13:44:43 -05:00
parent 0a925a6f21
commit d28f44335a
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -62,8 +62,8 @@ namespace {
~JniRef() ~JniRef()
{ {
JNIEnv *env = NULL; JNIEnv *env;
jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, jvm);
env->DeleteGlobalRef(dataStoreGetListener); env->DeleteGlobalRef(dataStoreGetListener);
env->DeleteGlobalRef(dataStorePutListener); env->DeleteGlobalRef(dataStorePutListener);
@ -110,8 +110,8 @@ namespace {
{ {
LOGV("VirtualNetworkConfigFunctionCallback"); LOGV("VirtualNetworkConfigFunctionCallback");
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
if (ref->configListener == NULL) { if (ref->configListener == NULL) {
LOGE("configListener is NULL"); LOGE("configListener is NULL");
@ -160,8 +160,8 @@ namespace {
#endif #endif
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
if (ref->frameListener == NULL) { if (ref->frameListener == NULL) {
LOGE("frameListener is NULL"); LOGE("frameListener is NULL");
@ -190,8 +190,8 @@ namespace {
LOGE("Nodes not equal. ref->node %p, node %p. Event: %d", ref->node, node, event); LOGE("Nodes not equal. ref->node %p, node %p. Event: %d", ref->node, node, event);
return; return;
} }
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void **) &env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
if (ref->eventListener == NULL) { if (ref->eventListener == NULL) {
LOGE("eventListener is NULL"); LOGE("eventListener is NULL");
@ -287,8 +287,8 @@ namespace {
} }
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
if (ref->dataStorePutListener == NULL) { if (ref->dataStorePutListener == NULL) {
LOGE("dataStorePutListener is NULL"); LOGE("dataStorePutListener is NULL");
@ -352,8 +352,8 @@ namespace {
} }
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
if (ref->dataStoreGetListener == NULL) { if (ref->dataStoreGetListener == NULL) {
LOGE("dataStoreGetListener is NULL"); LOGE("dataStoreGetListener is NULL");
@ -406,8 +406,8 @@ namespace {
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
assert(ref->node == node); assert(ref->node == node);
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
if (ref->packetSender == NULL) { if (ref->packetSender == NULL) {
LOGE("packetSender is NULL"); LOGE("packetSender is NULL");
@ -448,8 +448,8 @@ namespace {
return true; return true;
} }
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
// //
// may be NULL // may be NULL
@ -476,8 +476,8 @@ namespace {
return false; return false;
} }
JNIEnv *env = NULL; JNIEnv *env;
ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6); GETENV(env, ref->jvm);
jobject sockAddressObject = env->CallObjectMethod(ref->pathChecker, PathChecker_onPathLookup_method, address, ss_family); jobject sockAddressObject = env->CallObjectMethod(ref->pathChecker, PathChecker_onPathLookup_method, address, ss_family);
if(sockAddressObject == NULL) if(sockAddressObject == NULL)
@ -606,7 +606,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
ZT_Node *node; ZT_Node *node;
JniRef *ref = new JniRef; JniRef *ref = new JniRef;
ref->id = (int64_t)now; ref->id = (int64_t)now;
env->GetJavaVM(&ref->jvm); GETJAVAVM(env, ref->jvm);
if(dataStoreGetListener == NULL) if(dataStoreGetListener == NULL)
{ {