#include <stdlib.h>
#include <string.h>
-#include <jni.h>
-
-#include <sys/types.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/sysmacros.h>
+#include <sys/types.h>
#include <sys/un.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <dirent.h>
+
+#include <jni.h>
+
+//#include <linux/if.h>
+#include <linux/if_tun.h>
#include <mLib/align.h>
#include <mLib/bits.h>
#include <catacomb/ghash.h>
+#define TUN_INTERNALS
+#include <tripe.h>
+
#undef sun
/*----- Magic class names and similar -------------------------------------*/
#define JNIFUNC(f) Java_uk_org_distorted_tripe_sys_package_00024_##f
/* The little class for bundling up error codes. */
-#define ERRENTRY "uk/org/distorted/tripe/sys/package$ErrorEntry"
+#define ERRENTCLS "uk/org/distorted/tripe/sys/package$ErrorEntry"
+
+/* The `sys' package class. */
+#define SYSCLS "uk/org/distorted/tripe/sys/package"
+
+/* The server lock class. */
+#define LOCKCLS "uk/org/distorted/tripe/sys/package$ServerLock"
/* The `stat' class. */
-#define STAT "uk/org/distorted/tripe/sys/package$FileInfo"
+#define STATCLS "uk/org/distorted/tripe/sys/package$FileInfo"
+
+/* Standard Java classes. */
+#define FDCLS "java/io/FileDescriptor"
+#define STRCLS "java/lang/String"
+#define RANDCLS "java/security/SecureRandom"
/* Exception class names. */
#define NULLERR "java/lang/NullPointerException"
#define TYPEERR "uk/org/distorted/tripe/sys/package$NativeObjectTypeException"
#define SYSERR "uk/org/distorted/tripe/sys/package$SystemError"
+#define NAMEERR "uk/org/distorted/tripe/sys/package$NameResolutionException"
+#define INITERR "uk/org/distorted/tripe/sys/package$InitializationException"
#define ARGERR "java/lang/IllegalArgumentException"
+#define STERR "java/lang/IllegalStateException"
#define BOUNDSERR "java/lang/IndexOutOfBoundsException"
-/*----- Miscellaneous utilities -------------------------------------------*/
+/*----- Essential state ---------------------------------------------------*/
-static void put_cstring(JNIEnv *jni, jbyteArray v, const char *p)
- { if (p) (*jni)->ReleaseByteArrayElements(jni, v, (jbyte *)p, JNI_ABORT); }
+static JNIEnv *jni_tripe = 0;
+
+/*----- Miscellaneous utilities -------------------------------------------*/
static void vexcept(JNIEnv *jni, const char *clsname,
const char *msg, va_list *ap)
return ((const char *)(*jni)->GetByteArrayElements(jni, v, 0));
}
+static void put_cstring(JNIEnv *jni, jbyteArray v, const char *p)
+ { if (p) (*jni)->ReleaseByteArrayElements(jni, v, (jbyte *)p, JNI_ABORT); }
+
static void vexcept_syserror(JNIEnv *jni, const char *clsname,
int err, const char *msg, va_list *ap)
{
jobject e;
eltcls =
- (*jni)->FindClass(jni, ERRENTRY);
+ (*jni)->FindClass(jni, ERRENTCLS);
assert(eltcls);
v = (*jni)->NewObjectArray(jni, N(errtab), eltcls, 0); if (!v) return (0);
init = (*jni)->GetMethodID(jni, eltcls, "<init>",
- "(Ljava/lang/String;I)V");
+ "(L"STRCLS";I)V");
assert(init);
for (i = 0; i < N(errtab); i++) {
static void fdguts(JNIEnv *jni, jclass *cls, jfieldID *fid)
{
- *cls = (*jni)->FindClass(jni, "java/io/FileDescriptor"); assert(cls);
+ *cls = (*jni)->FindClass(jni, FDCLS); assert(cls);
*fid = (*jni)->GetFieldID(jni, *cls, "fd", "I"); // OpenJDK
if (!*fid) *fid = (*jni)->GetFieldID(jni, *cls, "descriptor", "I"); // Android
assert(*fid);
put_cstring(jni, path, pathstr);
}
+JNIEXPORT void JNIFUNC(chmod)(JNIEnv *jni, jobject cls,
+ jobject path, jint mode)
+{
+ const char *pathstr = 0;
+
+ pathstr = get_cstring(jni, path); if (!pathstr) goto end;
+ if (chmod(pathstr, mode)) {
+ except_syserror(jni, SYSERR, errno,
+ "failed st permissions on `%s'", pathstr);
+ goto end;
+ }
+end:
+ put_cstring(jni, path, pathstr);
+}
+
JNIEXPORT void JNIFUNC(mkfile)(JNIEnv *jni, jobject cls,
jobject path, jint mode)
{
else if (S_ISLNK(st->st_mode)) modehack |= 0120000;
else if (S_ISSOCK(st->st_mode)) modehack |= 0140000;
- cls = (*jni)->FindClass(jni, STAT); assert(cls);
+ cls = (*jni)->FindClass(jni, STATCLS); assert(cls);
init = (*jni)->GetMethodID(jni, cls, "<init>", "(IIJIIIIIIJIJJJJ)V");
assert(init);
return ((*jni)->NewObject(jni, cls, init,
static const struct native_type trigger_type =
{ "trigger", sizeof(struct trigger), 0x65ffd8b4 };
-JNIEXPORT wrapper JNICALL JNIFUNC(makeTrigger)(JNIEnv *jni, jobject cls)
+JNIEXPORT wrapper JNICALL JNIFUNC(make_1trigger)(JNIEnv *jni, jobject cls)
{
struct trigger trig;
int fd[2];
return (ret);
}
-JNIEXPORT void JNICALL JNIFUNC(destroyTrigger)(JNIEnv *jni, jobject cls,
- wrapper wtrig)
+JNIEXPORT void JNICALL JNIFUNC(destroy_1trigger)(JNIEnv *jni, jobject cls,
+ wrapper wtrig)
{
struct trigger trig;
update_wrapper(jni, &trigger_type, wtrig, &trig);
}
-JNIEXPORT void JNICALL JNIFUNC(resetTrigger)(JNIEnv *jni, jobject cls,
- wrapper wtrig)
+JNIEXPORT void JNICALL JNIFUNC(reset_1trigger)(JNIEnv *jni, jobject cls,
+ wrapper wtrig)
{
struct trigger trig;
char buf[64];
except_syserror(jni, SYSERR, errno, "failed to pull trigger");
}
-/*----- A server connection, using a Unix-domain socket -------------------*/
+/*----- A tunnel supplied by Java -----------------------------------------*/
-struct conn {
- struct native_base _base;
- int fd;
- unsigned f;
-#define CF_CLOSERD 1u
-#define CF_CLOSEWR 2u
-#define CF_CLOSEMASK (CF_CLOSERD | CF_CLOSEWR)
+struct tunnel {
+ const tunnel_ops *ops;
+ sel_file f;
+ struct peer *p;
};
-static const struct native_type conn_type =
- { "conn", sizeof(struct conn), 0xed030167 };
-JNIEXPORT wrapper JNICALL JNIFUNC(connect)(JNIEnv *jni, jobject cls,
- jobject path, wrapper wtrig)
+static const struct tunnel_ops tun_java;
+
+static int t_init(void) { return (0); }
+
+static void t_read(int fd, unsigned mode, void *v)
{
- struct conn conn;
- struct trigger trig;
- struct sockaddr_un sun;
- int rc, maxfd;
- fd_set rfds, wfds;
- const char *pathstr = 0;
- int err;
- socklen_t sz;
- wrapper ret = 0;
- int nb;
- int fd = -1;
+ tunnel *t = v;
+ ssize_t n;
+ buf b;
- if (unwrap(jni, &trig, &trigger_type, wtrig)) goto end;
- pathstr = get_cstring(jni, path); if (!pathstr) goto end;
- if (strlen(pathstr) >= sizeof(sun.sun_path)) {
- except(jni, ARGERR,
- "Unix-domain socket path `%s' too long", pathstr);
+ n = read(fd, buf_i, sizeof(buf_i));
+ if (n < 0) {
+ a_warn("TUN", "%s", p_ifname(t->p), "java",
+ "read-error", "?ERRNO", A_END);
+ return;
+ }
+ IF_TRACING(T_TUNNEL, {
+ trace(T_TUNNEL, "tun-java: packet arrived");
+ trace_block(T_PACKET, "tunnel: packet contents", buf_i, n);
+ })
+ buf_init(&b, buf_i, n);
+ p_tun(t->p, &b);
+}
+
+static tunnel *t_create(peer *p, int fd, char **ifn)
+{
+ JNIEnv *jni = jni_tripe;
+ tunnel *t = 0;
+ const char *name = p_name(p);
+ jbyteArray jname;
+ size_t n = strlen(p_name(p));
+ jclass cls, metacls;
+ jstring jclsname, jexcmsg;
+ const char *clsname, *excmsg;
+ jmethodID mid;
+ jthrowable exc;
+
+ assert(jni);
+
+ jname = wrap_cstring(jni, name);
+ cls = (*jni)->FindClass(jni, SYSCLS); assert(cls);
+ mid = (*jni)->GetStaticMethodID(jni, cls, "getTunnelFd", "([B)I");
+ assert(mid);
+ fd = (*jni)->CallStaticIntMethod(jni, cls, mid, jname);
+
+ exc = (*jni)->ExceptionOccurred(jni);
+ if (exc) {
+ cls = (*jni)->GetObjectClass(jni, exc);
+ metacls = (*jni)->GetObjectClass(jni, cls);
+ mid = (*jni)->GetMethodID(jni, metacls,
+ "getName", "()L"STRCLS";");
+ assert(mid);
+ jclsname = (*jni)->CallObjectMethod(jni, cls, mid);
+ clsname = (*jni)->GetStringUTFChars(jni, jclsname, 0);
+ mid = (*jni)->GetMethodID(jni, cls,
+ "getMessage", "()L"STRCLS";");
+ jexcmsg = (*jni)->CallObjectMethod(jni, exc, mid);
+ excmsg = (*jni)->GetStringUTFChars(jni, jexcmsg, 0);
+ a_warn("TUN", "-", "java", "get-tunnel-fd-failed",
+ "%s", clsname, "%s", excmsg, A_END);
+ (*jni)->ReleaseStringUTFChars(jni, jclsname, clsname);
+ (*jni)->ReleaseStringUTFChars(jni, jexcmsg, excmsg);
+ (*jni)->ExceptionClear(jni);
goto end;
}
- INIT_NATIVE(conn, &conn);
- fd = socket(PF_UNIX, SOCK_STREAM, 0); if (fd < 0) goto err;
- nb = set_nonblocking(jni, fd, 1); if (nb < 0) goto end;
+ t = CREATE(tunnel);
+ t->ops = &tun_java;
+ t->p = p;
+ sel_initfile(&sel, &t->f, fd, SEL_READ, t_read, t);
- sun.sun_family = AF_UNIX;
- strcpy(sun.sun_path, (char *)pathstr);
- if (!connect(fd, (struct sockaddr *)&sun, sizeof(sun))) goto connected;
- else if (errno != EINPROGRESS) goto err;
+ if (!*ifn) {
+ *ifn = xmalloc(n + 5);
+ sprintf(*ifn, "vpn-%s", name);
+ }
- maxfd = trig.rfd;
- if (maxfd < fd) maxfd = fd;
- for (;;) {
- FD_ZERO(&rfds); FD_SET(trig.rfd, &rfds);
- FD_ZERO(&wfds); FD_SET(fd, &wfds);
- rc = select(maxfd + 1, &rfds, &wfds, 0, 0); if (rc < 0) goto err;
- if (FD_ISSET(trig.rfd, &rfds)) goto end;
- if (FD_ISSET(fd, &wfds)) {
- sz = sizeof(sun);
- if (!getpeername(fd, (struct sockaddr *)&sun, &sz)) goto connected;
- else if (errno != ENOTCONN) goto err;
- sz = sizeof(err);
- if (!getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &sz)) errno = err;
- goto err;
- }
+end:
+ return (t);
+}
+
+static void t_inject(tunnel *t, buf *b)
+{
+ IF_TRACING(T_TUNNEL, {
+ trace(T_TUNNEL, "tun-java: inject decrypted packet");
+ trace_block(T_PACKET, "tunnel: packet contents", BBASE(b), BLEN(b));
+ })
+ DISCARD(write(t->f.fd, BBASE(b), BLEN(b)));
+}
+
+static void t_destroy(tunnel *t)
+ { sel_rmfile(&t->f); close(t->f.fd); DESTROY(t); }
+
+static const struct tunnel_ops tun_java = {
+ "java", 0,
+ /* init */ t_init,
+ /* create */ t_create,
+ /* setifname */ 0,
+ /* inject */ t_inject,
+ /* destroy */ t_destroy
+};
+
+
+JNIEXPORT jint JNICALL JNIFUNC(open_1tun)(JNIEnv *jni, jobject cls)
+{
+ int ret = -1;
+ int fd = -1;
+ struct ifreq iff;
+
+ if ((fd = open("/dev/net/tun", O_RDWR)) < 0) {
+ except_syserror(jni, SYSERR, errno, "failed to open tunnel device");
+ goto end;
}
-connected:
- if (set_nonblocking(jni, fd, nb) < 0) goto end;
- conn.fd = fd; fd = -1;
- conn.f = 0;
- ret = wrap(jni, &conn_type, &conn);
- goto end;
+ if (set_nonblocking(jni, fd, 1) || set_closeonexec(jni, fd)) goto end;
+
+ memset(&iff, 0, sizeof(iff));
+ iff.ifr_name[0] = 0;
+ iff.ifr_flags = IFF_TUN | IFF_NO_PI;
+ if (ioctl(fd, TUNSETIFF, &iff) < 0) {
+ except_syserror(jni, SYSERR, errno, "failed to configure tunnel device");
+ goto end;
+ }
+
+ ret = fd; fd = -1;
-err:
- except_syserror(jni, SYSERR, errno,
- "failed to connect to Unix-domain socket `%s'", pathstr);
end:
if (fd != -1) close(fd);
- put_cstring(jni, path, pathstr);
return (ret);
}
+/*----- A custom noise source ---------------------------------------------*/
+
+static void javanoise(rand_pool *r)
+{
+ JNIEnv *jni = jni_tripe;
+ jclass cls;
+ jmethodID mid;
+ jbyteArray v;
+ jbyte *p;
+ jsize n;
+
+ noise_devrandom(r);
+
+ assert(jni);
+ cls = (*jni)->FindClass(jni, RANDCLS); assert(cls);
+ mid = (*jni)->GetStaticMethodID(jni, cls, "getSeed", "(I)[B"); assert(mid);
+ v = (*jni)->CallStaticObjectMethod(jni, cls, mid, 32);
+ if (v) {
+ n = (*jni)->GetArrayLength(jni, v);
+ p = (*jni)->GetByteArrayElements(jni, v, 0);
+ rand_add(r, p, n, n);
+ (*jni)->ReleaseByteArrayElements(jni, v, p, JNI_ABORT);
+ }
+ if ((*jni)->ExceptionOccurred(jni)) {
+ (*jni)->ExceptionDescribe(jni);
+ (*jni)->ExceptionClear(jni);
+ }
+}
+
+static const rand_source javasource = { javanoise, noise_timer };
+
+/*----- Embedding the TrIPE server ----------------------------------------*/
+
+static void lock_tripe(JNIEnv *jni)
+{
+ jclass cls = (*jni)->FindClass(jni, LOCKCLS); assert(cls);
+ (*jni)->MonitorEnter(jni, cls);
+}
+
+static void unlock_tripe(JNIEnv *jni)
+{
+ jclass cls = (*jni)->FindClass(jni, LOCKCLS); assert(cls);
+ (*jni)->MonitorExit(jni, cls);
+}
+
+#define STATES(_) \
+ _(INIT) \
+ _(RESOLVE) \
+ _(KEYS) \
+ _(BIND) \
+ _(READY) \
+ _(RUNNING)
+
+enum {
+#define DEFTAG(st) st,
+ STATES(DEFTAG)
+#undef DEFTAG
+ MAXSTATE
+};
+
+static const char *statetab[] = {
+#define DEFNAME(st) #st,
+ STATES(DEFNAME)
+#undef DEFNAME
+};
+
+static unsigned state = INIT;
+static int clientsk = -1;
+
+static const char *statename(unsigned st)
+{
+ if (st >= MAXSTATE) return ("<invalid>");
+ else return (statetab[st]);
+}
+
+static int ensure_state(JNIEnv *jni, unsigned want)
+{
+ unsigned cur;
+
+ lock_tripe(jni);
+ cur = state;
+ unlock_tripe(jni);
+
+ if (cur != want) {
+ except(jni, STERR, "server is in state %s (%u), not %s (%u)",
+ statename(cur), cur, statename(want), want);
+ return (-1);
+ }
+ return (0);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(base_1init)(JNIEnv *jni, jobject cls)
+{
+ int fd[2];
+ int i;
+
+ for (i = 0; i < N(fd); i++) fd[i] = -1;
+
+ lock_tripe(jni);
+ jni_tripe = jni;
+ if (ensure_state(jni, INIT)) goto end;
+
+ if (socketpair(PF_UNIX, SOCK_STREAM, 0, fd)) {
+ except_syserror(jni, SYSERR, errno, "failed to create socket pair");
+ goto end;
+ }
+
+ clientsk = fd[0]; fd[0] = -1;
+
+ rand_noisesrc(RAND_GLOBAL, &javasource);
+ rand_seed(RAND_GLOBAL, MAXHASHSZ);
+ lp_init();
+ a_create(fd[1], fd[1], AF_NOTE | AF_WARN | AF_TRACE); fd[1] = -1;
+ a_switcherr();
+ p_addtun(&tun_java); p_setdflttun(&tun_java);
+ p_init();
+ kx_init();
+
+ state++;
+
+end:
+ for (i = 0; i < N(fd); i++) if (fd[i] != -1) close(fd[i]);
+ jni_tripe = 0;
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(setup_1resolver)(JNIEnv *jni, jobject cls)
+{
+ lock_tripe(jni);
+ if (ensure_state(jni, RESOLVE)) goto end;
+
+ if (a_init())
+ { except(jni, INITERR, "failed to initialize resolver"); return; }
+
+ state++;
+
+end:
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(load_1keys)(JNIEnv *jni, jobject cls,
+ jobject privstr, jobject pubstr,
+ jobject tagstr)
+{
+ const char *priv = 0, *pub = 0, *tag = 0;
+
+ lock_tripe(jni);
+ if (ensure_state(jni, KEYS)) return;
+
+ priv = get_cstring(jni, privstr); if (!priv) goto end;
+ pub = get_cstring(jni, pubstr); if (!pub) goto end;
+ tag = get_cstring(jni, tagstr); if (!tag) goto end;
+
+ if (km_init(priv, pub, tag))
+ { except(jni, INITERR, "failed to load initial keys"); goto end; }
+
+ state++;
+
+end:
+ put_cstring(jni, privstr, priv);
+ put_cstring(jni, pubstr, pub);
+ put_cstring(jni, tagstr, tag);
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(unload_1keys)(JNIEnv *jni, jobject cls)
+{
+ lock_tripe(jni);
+ if (ensure_state(jni, KEYS + 1)) goto end;
+
+ km_clear();
+
+ state--;
+
+end:
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(bind)(JNIEnv *jni, jobject cls,
+ jbyteArray hoststr, jbyteArray svcstr)
+{
+ const char *host = 0, *svc = 0;
+ struct addrinfo hint, *ai = 0;
+ int err;
+
+ lock_tripe(jni);
+ if (ensure_state(jni, BIND)) goto end;
+
+ if (hoststr) { host = get_cstring(jni, hoststr); if (!host) goto end; }
+ svc = get_cstring(jni, svcstr); if (!svc) goto end;
+
+ hint.ai_socktype = SOCK_DGRAM;
+ hint.ai_family = AF_UNSPEC;
+ hint.ai_protocol = IPPROTO_UDP;
+ hint.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
+ err = getaddrinfo(host, svc, &hint, &ai);
+ if (err) {
+ except(jni, NAMEERR, "failed to resolve %c%s%c, port `%s': %s",
+ host ? '`' : '<', host ? host : "nil", host ? '\'' : '>',
+ svc, gai_strerror(err));
+ goto end;
+ }
+
+ if (p_bind(ai))
+ { except(jni, INITERR, "failed to bind master socket"); goto end; }
+
+ state++;
+
+end:
+ if (ai) freeaddrinfo(ai);
+ put_cstring(jni, hoststr, host);
+ put_cstring(jni, svcstr, svc);
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(unbind)(JNIEnv *jni, jobject cls)
+{
+ lock_tripe(jni);
+ if (ensure_state(jni, BIND + 1)) goto end;
+
+ p_unbind();
+
+ state--;
+
+end:
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(mark)(JNIEnv *jni, jobject cls, jint seq)
+{
+ lock_tripe(jni);
+ a_notify("MARK", "%d", seq, A_END);
+ unlock_tripe(jni);
+}
+
+JNIEXPORT void JNICALL JNIFUNC(run)(JNIEnv *jni, jobject cls)
+{
+ lock_tripe(jni);
+ if (ensure_state(jni, READY)) goto end;
+ assert(!jni_tripe);
+ jni_tripe = jni;
+ state = RUNNING;
+ unlock_tripe(jni);
+
+ lp_run();
+
+ lock_tripe(jni);
+ jni_tripe = 0;
+ state = READY;
+
+end:
+ unlock_tripe(jni);
+}
+
static int check_buffer_bounds(JNIEnv *jni, const char *what,
jbyteArray buf, jint start, jint len)
{
}
JNIEXPORT void JNICALL JNIFUNC(send)(JNIEnv *jni, jobject cls,
- wrapper wconn, jbyteArray buf,
+ jbyteArray buf,
jint start, jint len,
wrapper wtrig)
{
- struct conn conn;
struct trigger trig;
int rc, maxfd;
ssize_t n;
fd_set rfds, wfds;
jbyte *p = 0;
- if (unwrap(jni, &conn, &conn_type, wconn)) goto end;
+ if (ensure_state(jni, RUNNING)) goto end;
+
if (unwrap(jni, &trig, &trigger_type, wtrig)) goto end;
if (check_buffer_bounds(jni, "send", buf, start, len)) goto end;
if (!p) goto end;
maxfd = trig.rfd;
- if (maxfd < conn.fd) maxfd = conn.fd;
+ if (maxfd < clientsk) maxfd = clientsk;
while (len) {
FD_ZERO(&rfds); FD_SET(trig.rfd, &rfds);
- FD_ZERO(&wfds); FD_SET(conn.fd, &wfds);
+ FD_ZERO(&wfds); FD_SET(clientsk, &wfds);
rc = select(maxfd + 1, &rfds, &wfds, 0, 0); if (rc < 0) goto err;
if (FD_ISSET(trig.rfd, &rfds)) break;
- if (FD_ISSET(conn.fd, &wfds)) {
- n = send(conn.fd, p + start, len, 0);
+ if (FD_ISSET(clientsk, &wfds)) {
+ n = send(clientsk, p + start, len, 0);
if (n >= 0) { start += n; len -= n; }
else if (errno != EAGAIN && errno != EWOULDBLOCK) goto err;
}
}
JNIEXPORT jint JNICALL JNIFUNC(recv)(JNIEnv *jni, jobject cls,
- wrapper wconn, jbyteArray buf,
+ jbyteArray buf,
jint start, jint len,
wrapper wtrig)
{
- struct conn conn;
struct trigger trig;
int maxfd;
fd_set rfds;
jbyte *p = 0;
jint rc = -1;
- if (unwrap(jni, &conn, &conn_type, wconn)) goto end;
+ lock_tripe(jni);
+ if (clientsk == -1) {
+ except(jni, STERR, "client connection not established");
+ unlock_tripe(jni);
+ goto end;
+ }
+ unlock_tripe(jni);
+
if (unwrap(jni, &trig, &trigger_type, wtrig)) goto end;
if (check_buffer_bounds(jni, "send", buf, start, len)) goto end;
if (!p) goto end;
maxfd = trig.rfd;
- if (maxfd < conn.fd) maxfd = conn.fd;
+ if (maxfd < clientsk) maxfd = clientsk;
for (;;) {
- FD_ZERO(&rfds); FD_SET(trig.rfd, &rfds); FD_SET(conn.fd, &rfds);
+ FD_ZERO(&rfds); FD_SET(trig.rfd, &rfds); FD_SET(clientsk, &rfds);
rc = select(maxfd + 1, &rfds, 0, 0, 0); if (rc < 0) goto err;
if (FD_ISSET(trig.rfd, &rfds)) {
break;
}
- if (FD_ISSET(conn.fd, &rfds)) {
- rc = recv(conn.fd, p + start, len, 0);
+ if (FD_ISSET(clientsk, &rfds)) {
+ rc = recv(clientsk, p + start, len, 0);
if (rc >= 0) break;
else if (errno != EAGAIN && errno != EWOULDBLOCK) goto err;
}
return (rc);
}
-JNIEXPORT void JNICALL JNIFUNC(closeconn)(JNIEnv *jni, jobject cls,
- wrapper wconn, jint how)
-{
- struct conn conn;
- int rc;
-
- if (unwrap(jni, &conn, &conn_type, wconn)) goto end;
- if (conn.fd == -1) goto end;
-
- how &= CF_CLOSEMASK&~conn.f;
- conn.f |= how;
- if ((conn.f&CF_CLOSEMASK) == CF_CLOSEMASK) {
- close(conn.fd);
- conn.fd = -1;
- } else {
- if (how&CF_CLOSERD) shutdown(conn.fd, SHUT_RD);
- if (how&CF_CLOSEWR) shutdown(conn.fd, SHUT_WR);
- }
- rc = update_wrapper(jni, &conn_type, wconn, &conn); assert(!rc);
-
-end:
- return;
-}
-
/*----- That's all, folks -------------------------------------------------*/
~mdw / tripe-android / blobdiff