void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-09-23 15:05:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix JNI after ZT_Node_New function signature change
Some checks failed
/ build_macos (push) Has been cancelled
Details
/ build_windows (push) Has been cancelled
Details
/ build_ubuntu (push) Has been cancelled
Details

Browse source
This commit is contained in:
Grant Limberg 2025-09-11 07:36:25 -07:00
parent dd3dbb6f24
commit 3e6a22c3d8
No known key found for this signature in database
GPG key ID: 8F2F97D3BE8D7735
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
java/jni/com_zerotierone_sdk_Node.cpp
View file

@ -53,7 +53,8 @@ namespace {
jobject eventListenerLocalIn, jobject eventListenerLocalIn,
jobject frameListenerLocalIn, jobject frameListenerLocalIn,
jobject configListenerLocalIn, jobject configListenerLocalIn,
jobject pathCheckerLocalIn) jobject pathCheckerLocalIn,
ZT_Node_Config *nc)
: id(id) : id(id)
, jvm(jvm) , jvm(jvm)
, node() , node()
@ -64,6 +65,7 @@ namespace {
, frameListener() , frameListener()
, configListener() , configListener()
, pathChecker() , pathChecker()
, nodeConfig(nc)
, inited() { , inited() {
JNIEnv *env; JNIEnv *env;
@ -90,6 +92,9 @@ namespace {
env->DeleteGlobalRef(frameListener); env->DeleteGlobalRef(frameListener);
env->DeleteGlobalRef(configListener); env->DeleteGlobalRef(configListener);
env->DeleteGlobalRef(pathChecker); env->DeleteGlobalRef(pathChecker);
delete nodeConfig;
nodeConfig = NULL;
} }
int64_t id; int64_t id;
@ -105,6 +110,7 @@ namespace {
jobject frameListener; jobject frameListener;
jobject configListener; jobject configListener;
jobject pathChecker; jobject pathChecker;
ZT_Node_Config *nodeConfig;
bool inited; bool inited;
@ -865,6 +871,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
callbacks.pathCheckFunction = &PathCheckFunction; callbacks.pathCheckFunction = &PathCheckFunction;
callbacks.pathLookupFunction = &PathLookupFunction; callbacks.pathLookupFunction = &PathLookupFunction;
ZT_Node_Config *nodeConfig = new ZT_Node_Config();
nodeConfig->enableEncryptedHello = 0;
nodeConfig->lowBandwidthMode = 0;
// //
// a bit of a confusing dance here where ref and node both know about each other // a bit of a confusing dance here where ref and node both know about each other
// //
@ -877,11 +887,13 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
eventListener, eventListener,
frameListener, frameListener,
configListener, configListener,
pathChecker); pathChecker,
nodeConfig);
ZT_Node *node; ZT_Node *node;
ZT_ResultCode rc = ZT_Node_new( ZT_ResultCode rc = ZT_Node_new(
&node, &node,
nodeConfig,
ref, ref,
NULL, NULL,
&callbacks, &callbacks,