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

zt_bind() ifdef fix

Browse Source
This commit is contained in:
Joseph Henry
2016-07-26 13:56:10 -07:00
parent a1fcd50be8
commit a152ce770d
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SDK_Sockets.c
View File

@@ -459,33 +459,31 @@ int (*realclose)(CLOSE_SIG);
addr.sin_family = AF_INET; addr.sin_family = AF_INET;
addr.sin_port = htons( port ); addr.sin_port = htons( port );
(*env)->ReleaseStringUTFChars(env, addrstr, str); (*env)->ReleaseStringUTFChars(env, addrstr, str);
return zt_bind(fd, (struct sockaddr *)&addr, sizeof(addr)); return zts_bind(fd, (struct sockaddr *)&addr, sizeof(addr));
} }
#endif #endif
#if !defined(__ANDROID__) #ifdef DYNAMIC_LIB
#ifdef DYNAMIC_LIB
int zt_bind(BIND_SIG) int zt_bind(BIND_SIG)
#else #else
int zts_bind(BIND_SIG) int zts_bind(BIND_SIG)
#endif #endif
{ {
get_api_netpath(); get_api_netpath();
dwr(MSG_DEBUG,"zt_bind(%d)\n", sockfd); dwr(MSG_DEBUG,"zt_bind(%d)\n", sockfd);
struct bind_st rpc_st; struct bind_st rpc_st;
rpc_st.sockfd = sockfd; rpc_st.sockfd = sockfd;
#if defined(__linux__) #if defined(__linux__)
#if !defined(__ANDROID__) #if !defined(__ANDROID__)
rpc_st.__tid = 5;//syscall(SYS_gettid); rpc_st.__tid = 5;//syscall(SYS_gettid);
#else #else
rpc_st.__tid = gettid(); // dummy value rpc_st.__tid = gettid(); // dummy value
#endif #endif
#endif #endif
memcpy(&rpc_st.addr, addr, sizeof(struct sockaddr_storage)); memcpy(&rpc_st.addr, addr, sizeof(struct sockaddr_storage));
memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t)); memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t));
return rpc_send_command(api_netpath, RPC_BIND, sockfd, &rpc_st, sizeof(struct bind_st)); return rpc_send_command(api_netpath, RPC_BIND, sockfd, &rpc_st, sizeof(struct bind_st));
} }
#endif
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// ----------------------------------- accept4() -------------------------------- // ----------------------------------- accept4() --------------------------------