diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-01-22 18:06:58 -0800 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-01-22 18:06:58 -0800 |
| commit | 3993dfa2a55516cfc5aee95f6889dc6ea8653918 (patch) | |
| tree | 0a6066b17c0bc032b0f415dfe335ffda3d80716c | |
| parent | 9cc2733ed877faed30154035f0efe95633e88ac2 (diff) | |
| download | infinitytier-3993dfa2a55516cfc5aee95f6889dc6ea8653918.tar.gz infinitytier-3993dfa2a55516cfc5aee95f6889dc6ea8653918.zip | |
Fix JNI for API changes in 1.1.4
| -rw-r--r-- | java/jni/com_zerotierone_sdk_Node.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index 2c1b6807..dbabf803 100644 --- a/java/jni/com_zerotierone_sdk_Node.cpp +++ b/java/jni/com_zerotierone_sdk_Node.cpp @@ -90,6 +90,7 @@ namespace { ZT_Node *node, void *userData, uint64_t nwid, + void **, enum ZT_VirtualNetworkConfigOperation operation, const ZT_VirtualNetworkConfig *config) { @@ -137,6 +138,7 @@ namespace { void VirtualNetworkFrameFunctionCallback(ZT_Node *node, void *userData, uint64_t nwid, + void**, uint64_t sourceMac, uint64_t destMac, unsigned int etherType, @@ -609,6 +611,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init( &WirePacketSendFunction, &VirtualNetworkFrameFunctionCallback, &VirtualNetworkConfigFunctionCallback, + NULL, &EventCallback); if(rc != ZT_RESULT_OK) @@ -995,7 +998,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_join( uint64_t nwid = (uint64_t)in_nwid; - ZT_ResultCode rc = ZT_Node_join(node, nwid); + ZT_ResultCode rc = ZT_Node_join(node, nwid, NULL); return createResultObject(env, rc); } @@ -1018,8 +1021,8 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_leave( uint64_t nwid = (uint64_t)in_nwid; - ZT_ResultCode rc = ZT_Node_leave(node, nwid); - + ZT_ResultCode rc = ZT_Node_leave(node, nwid, NULL); + return createResultObject(env, rc); } |