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

Android API rx/tx update

Browse Source
This commit is contained in:
Joseph Henry
2016-08-02 14:48:37 -07:00
parent e29bb41544
commit f96b254e94
4 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SDK_EthernetTap.cpp
View File

@@ -794,11 +794,11 @@ err_t NetconEthernetTap::nc_recved(void *arg, struct tcp_pcb *PCB, struct pbuf *
tot += len;
}
if(tot) {
#if defined(USE_SOCKS_PROXY)
l->tap->phyOnTcpWritable(l->conn->sock, NULL, true);
#else
//#if defined(USE_SOCKS_PROXY)
// l->tap->phyOnTcpWritable(l->conn->sock, NULL, true);
//#else
l->tap->phyOnUnixWritable(l->conn->sock, NULL, true);
#endif
//#endif
}
l->tap->lwipstack->__pbuf_free(q);
return ERR_OK;

21
src/SDK_Sockets.c
View File

@@ -305,6 +305,27 @@ int (*realclose)(CLOSE_SIG);
return fcntl(fd, F_SETFL, O_NONBLOCK);
}
#endif
// ------------------------------------------------------------------------------
// ----------------------- Exposed RX/TX API for Java JNI -----------------------
// ------------------------------------------------------------------------------
// TX
JNIEXPORT jint JNICALL Java_ZeroTier_SDK_zt_1write(JNIEnv *env, jobject thisObj, jint fd, jarray buf, jint len)
{
jbyte *body = (*env)->GetByteArrayElements(env, buf, 0);
int written_bytes = write(fd, body, len);
(*env)->ReleaseByteArrayElements(env, buf, body, 0);
return written_bytes;
}
// RX
JNIEXPORT jint JNICALL Java_ZeroTier_SDK_zt_1read(JNIEnv *env, jobject thisObj, jint fd, jarray buf, jint len)
{
jbyte *body = (*env)->GetByteArrayElements(env, buf, 0);
int read_bytes = read(fd, body, len);
(*env)->ReleaseByteArrayElements(env, buf, body, 0);
return read_bytes;
}
// ------------------------------------------------------------------------------
// --------------------------------- setsockopt() -------------------------------