Procházet zdrojové kódy

Fix JNI for API changes in 1.1.4

Grant Limberg před 9 roky
rodič
revize
3993dfa2a5
1 změnil soubory, kde provedl 6 přidání a 3 odebrání
  1. 6 3
      java/jni/com_zerotierone_sdk_Node.cpp

+ 6 - 3
java/jni/com_zerotierone_sdk_Node.cpp

@@ -90,6 +90,7 @@ namespace {
         ZT_Node *node,
         ZT_Node *node,
         void *userData,
         void *userData,
         uint64_t nwid,
         uint64_t nwid,
+        void **,
         enum ZT_VirtualNetworkConfigOperation operation,
         enum ZT_VirtualNetworkConfigOperation operation,
         const ZT_VirtualNetworkConfig *config)
         const ZT_VirtualNetworkConfig *config)
     {
     {
@@ -137,6 +138,7 @@ namespace {
     void VirtualNetworkFrameFunctionCallback(ZT_Node *node,
     void VirtualNetworkFrameFunctionCallback(ZT_Node *node,
         void *userData,
         void *userData,
         uint64_t nwid,
         uint64_t nwid,
+        void**,
         uint64_t sourceMac,
         uint64_t sourceMac,
         uint64_t destMac,
         uint64_t destMac,
         unsigned int etherType,
         unsigned int etherType,
@@ -609,6 +611,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
         &WirePacketSendFunction,
         &WirePacketSendFunction,
         &VirtualNetworkFrameFunctionCallback,
         &VirtualNetworkFrameFunctionCallback,
         &VirtualNetworkConfigFunctionCallback,
         &VirtualNetworkConfigFunctionCallback,
+        NULL,
         &EventCallback);
         &EventCallback);
 
 
     if(rc != ZT_RESULT_OK)
     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;
     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);
     return createResultObject(env, rc);
 }
 }
@@ -1018,8 +1021,8 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_leave(
 
 
     uint64_t nwid = (uint64_t)in_nwid;
     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);
     return createResultObject(env, rc);
 }
 }