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

Temporary fixes for warnings

Browse Source
This commit is contained in:
Joseph Henry
2017-12-04 17:00:52 -08:00
parent 2a2981a78e
commit 50c0e802d8
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/libztDefs.h
View File

@@ -175,9 +175,9 @@ struct sockaddr_ll {
#define SO_STYLE 100 #define SO_STYLE 100
#define TCP_CORK 101 #define TCP_CORK 101
#define TCP_DEFER_ACCEPT 102 #define TCP_DEFER_ACCEPT 102
#ifndef TCP_KEEPIDLE //#ifndef TCP_KEEPIDLE
#define TCP_KEEPIDLE 103 //#define TCP_KEEPIDLE 103
#endif //#endif
#define TCP_LINGER2 104 #define TCP_LINGER2 104
#define TCP_QUICKACK 105 #define TCP_QUICKACK 105
#define TCP_SYNCNT 106 #define TCP_SYNCNT 106

12
src/libztJNI.cpp
View File

@@ -208,8 +208,6 @@ namespace ZeroTier {
JNIEnv *env, jobject thisObj, jint fd, jobject addr) JNIEnv *env, jobject thisObj, jint fd, jobject addr)
{ {
struct sockaddr_storage ss; struct sockaddr_storage ss;
struct sockaddr_in *in4 = (struct sockaddr_in*)&ss;
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)&ss;
int err; int err;
if(sockinet2ss(env, addr, &ss) < 0) { if(sockinet2ss(env, addr, &ss) < 0) {
return -1; // possibly invalid address format return -1; // possibly invalid address format
@@ -247,7 +245,7 @@ namespace ZeroTier {
struct sockaddr_storage ss; struct sockaddr_storage ss;
int err; int err;
socklen_t addrlen = sizeof(struct sockaddr_storage); socklen_t addrlen = sizeof(struct sockaddr_storage);
if ((err = zts_accept(fd, (struct sockaddr *)&ss, &addrlen, flags)) < 0) { if ((err = zts_accept4(fd, (struct sockaddr *)&ss, &addrlen, flags)) < 0) {
return err; return err;
} }
addr = ss2inet(env, &ss); addr = ss2inet(env, &ss);
@@ -258,13 +256,13 @@ namespace ZeroTier {
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_setsockopt( JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_setsockopt(
JNIEnv *env, jobject thisObj, jint fd, jint level, jint optname, jint optval, jint optlen) JNIEnv *env, jobject thisObj, jint fd, jint level, jint optname, jint optval, jint optlen)
{ {
return zts_setsockopt(fd, level, optname, (const void*)optval, optlen); return zts_setsockopt(fd, level, optname, (void*)(uintptr_t)optval, optlen);
} }
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_getsockopt( JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_getsockopt(
JNIEnv *env, jobject thisObj, jint fd, jint level, jint optname, jint optval, jint optlen) JNIEnv *env, jobject thisObj, jint fd, jint level, jint optname, jint optval, jint optlen)
{ {
return zts_getsockopt(fd, level, optname, (void*)optval, (socklen_t *)optlen); return zts_getsockopt(fd, level, optname, (void*)(uintptr_t)optval, (socklen_t *)optlen);
} }
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_getsockname(JNIEnv *env, jobject thisObj, JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_getsockname(JNIEnv *env, jobject thisObj,
@@ -452,7 +450,6 @@ int sockinet2ss(JNIEnv *env, jobject src_inet, struct sockaddr_storage *dest_ss)
{ {
struct sockaddr_in *in4 = (struct sockaddr_in*)dest_ss; struct sockaddr_in *in4 = (struct sockaddr_in*)dest_ss;
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)dest_ss; struct sockaddr_in6 *in6 = (struct sockaddr_in6*)dest_ss;
int err = -1;
int port = 0; int port = 0;
int socket_family = 0; int socket_family = 0;
socklen_t addrlen; socklen_t addrlen;
@@ -471,7 +468,6 @@ int sockinet2ss(JNIEnv *env, jobject src_inet, struct sockaddr_storage *dest_ss)
port = (*env).CallIntMethod(src_inet, getPort); port = (*env).CallIntMethod(src_inet, getPort);
// get internal InetAddress // get internal InetAddress
jobject inetaddr; jobject inetaddr;
int family = 0;
jmethodID getAddress = (*env).GetMethodID(c, "getAddress", "()Ljava/net/InetAddress;"); jmethodID getAddress = (*env).GetMethodID(c, "getAddress", "()Ljava/net/InetAddress;");
if (!getAddress) { if (!getAddress) {
return -1; return -1;
@@ -515,9 +511,9 @@ int sockinet2ss(JNIEnv *env, jobject src_inet, struct sockaddr_storage *dest_ss)
} }
(*env).ReleaseStringUTFChars(addrstr, addr_str); (*env).ReleaseStringUTFChars(addrstr, addr_str);
DEBUG_TEST("RESULT => %s : %d", inet_ntoa(in4->sin_addr), ntohs(in4->sin_port)); DEBUG_TEST("RESULT => %s : %d", inet_ntoa(in4->sin_addr), ntohs(in4->sin_port));
return 0;
} }
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif