gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #239 from zerotier/brenton/fix-incorrect-types

Browse Source 
Fix: Incorrect type for parameter 'net_id', which should have type 'j…
This commit is contained in:
Joseph Henry
2023-08-02 10:13:27 -07:00
committed by GitHub
parent 79636da66e 8aa689034e
commit 431c4214a5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bindings/java/JavaSockets.cxx
View File

@@ -600,7 +600,7 @@ JNIEXPORT jint JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1addr_1is_1a
//} //}
JNIEXPORT jstring JNICALL JNIEXPORT jstring JNICALL
Java_com_zerotier_sockets_ZeroTierNative_zts_1addr_1get_1str(JNIEnv* jenv, jclass clazz, long net_id, jint family) Java_com_zerotier_sockets_ZeroTierNative_zts_1addr_1get_1str(JNIEnv* jenv, jclass clazz, jlong net_id, jint family)
{ {
char ip_str[ZTS_IP_MAX_STR_LEN] = { 0 }; char ip_str[ZTS_IP_MAX_STR_LEN] = { 0 };
zts_addr_get_str(net_id, family, ip_str, ZTS_IP_MAX_STR_LEN); zts_addr_get_str(net_id, family, ip_str, ZTS_IP_MAX_STR_LEN);
@@ -659,7 +659,7 @@ JNIEXPORT jint JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1addr_1compu
return ZTS_ERR_OK; return ZTS_ERR_OK;
} }
JNIEXPORT uint64_t JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1net_1compute_1adhoc_1id( JNIEXPORT jlong JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1net_1compute_1adhoc_1id(
JNIEnv* jenv, JNIEnv* jenv,
jclass clazz, jclass clazz,
short start_port, short start_port,
@@ -674,7 +674,7 @@ Java_com_zerotier_sockets_ZeroTierNative_zts_1net_1transport_1is_1ready(JNIEnv*
return zts_net_transport_is_ready(net_id); return zts_net_transport_is_ready(net_id);
} }
JNIEXPORT uint64_t JNICALL JNIEXPORT jlong JNICALL
Java_com_zerotier_sockets_ZeroTierNative_zts_1net_1get_1mac(JNIEnv* jenv, jclass clazz, jlong net_id) Java_com_zerotier_sockets_ZeroTierNative_zts_1net_1get_1mac(JNIEnv* jenv, jclass clazz, jlong net_id)
{ {
return zts_net_get_mac(net_id); return zts_net_get_mac(net_id);
@@ -742,7 +742,7 @@ JNIEXPORT jint JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1node_1is_1o
return zts_node_is_online(); return zts_node_is_online();
} }
JNIEXPORT uint64_t JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1node_1get_1id(JNIEnv* jenv, jclass clazz) JNIEXPORT jlong JNICALL Java_com_zerotier_sockets_ZeroTierNative_zts_1node_1get_1id(JNIEnv* jenv, jclass clazz)
{ {
return zts_node_get_id(); return zts_node_get_id();
} }