diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-01-22 18:07:20 -0800 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-01-22 18:07:20 -0800 |
| commit | 67f678d60a7907ff196cff42460c23e33cc9ac1e (patch) | |
| tree | 0abaf09adec877813f7e928a520fc98435d5bb68 /java/jni | |
| parent | bafdb54752e8e953715a6547d13716b9c59e9d53 (diff) | |
| parent | 3993dfa2a55516cfc5aee95f6889dc6ea8653918 (diff) | |
| download | infinitytier-67f678d60a7907ff196cff42460c23e33cc9ac1e.tar.gz infinitytier-67f678d60a7907ff196cff42460c23e33cc9ac1e.zip | |
Merge branch 'master' into dev
Diffstat (limited to 'java/jni')
| -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); } |