ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-01 00:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Grant Limberg 2016-01-22 18:07:20 -08:00
commit 67f678d60a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -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);
}