Removed cruft from project
This commit is contained in:
381
src/libztJNI.cpp
381
src/libztJNI.cpp
@@ -48,13 +48,12 @@ extern "C" {
|
||||
|
||||
namespace ZeroTier {
|
||||
|
||||
// prototype
|
||||
jobject ss2inet(JNIEnv *env, struct sockaddr_storage *src_ss);
|
||||
int sockinet2ss(JNIEnv *env, jobject src_inet, struct sockaddr_storage *dest_ss);
|
||||
void ss2zta(JNIEnv *env, struct sockaddr_storage *ss, jobject addr);
|
||||
void zta2ss(JNIEnv *env, struct sockaddr_storage *ss, jobject addr);
|
||||
|
||||
/****************************************************************************/
|
||||
/* ZeroTier service controls */
|
||||
/****************************************************************************/
|
||||
/* ZeroTier service controls */
|
||||
/****************************************************************************/
|
||||
|
||||
JNIEXPORT void JNICALL Java_zerotier_ZeroTier_start(
|
||||
JNIEnv *env, jobject thisObj, jstring path, jboolean blocking)
|
||||
@@ -122,23 +121,20 @@ namespace ZeroTier {
|
||||
return zts_get_node_id();
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API uint64_t ZTCALL zts_get_node_id_from_file(const char *filepath);
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_get_1num_1assigned_1addresses(
|
||||
JNIEXPORT jboolean JNICALL Java_zerotier_ZeroTier_get_1num_1assigned_1addresses(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid)
|
||||
{
|
||||
return zts_get_num_assigned_addresses(nwid);
|
||||
}
|
||||
|
||||
JNIEXPORT jobject JNICALL Java_zerotier_ZeroTier_get_1address_1at_1index(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jint index)
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_get_1address_1at_1index(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jint index, jobject addr)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
int err;
|
||||
if((err = zts_get_address_at_index(nwid, index, &ss)) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
return ss2inet(env, &ss);
|
||||
socklen_t addrlen = sizeof(struct sockaddr_storage);
|
||||
int err = zts_get_address_at_index(nwid, index, (struct sockaddr*)&ss, &addrlen);
|
||||
ss2zta(env, &ss, addr);
|
||||
return err;
|
||||
}
|
||||
|
||||
JNIEXPORT jboolean JNICALL Java_zerotier_ZeroTier_has_1address(
|
||||
@@ -147,31 +143,29 @@ namespace ZeroTier {
|
||||
return zts_has_address(nwid);
|
||||
}
|
||||
|
||||
JNIEXPORT jobject JNICALL Java_zerotier_ZeroTier_get_1address(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jint address_family)
|
||||
JNIEXPORT jboolean JNICALL Java_zerotier_ZeroTier_get_1address(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jint address_family, jobject addr)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
int err;
|
||||
if ((err = zts_get_address((uint64_t)nwid, &ss, address_family)) < 0) {
|
||||
return NULL;
|
||||
}
|
||||
return ss2inet(env, &ss);
|
||||
int err = zts_get_address((uint64_t)nwid, &ss, address_family);
|
||||
ss2zta(env, &ss, addr);
|
||||
return err;
|
||||
}
|
||||
|
||||
JNIEXPORT jobject JNICALL Java_zerotier_ZeroTier_get_6plane_addr(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jlong nodeId)
|
||||
JNIEXPORT void JNICALL Java_zerotier_ZeroTier_get_6plane_addr(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jlong nodeId, jobject addr)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
zts_get_6plane_addr(&ss, nwid, nodeId);
|
||||
return ss2inet(env, &ss);
|
||||
ss2zta(env, &ss, addr);
|
||||
}
|
||||
|
||||
JNIEXPORT jobject JNICALL Java_zerotier_ZeroTier_get_rfc4193_addr(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jlong nodeId)
|
||||
JNIEXPORT void JNICALL Java_zerotier_ZeroTier_get_rfc4193_addr(
|
||||
JNIEnv *env, jobject thisObj, jlong nwid, jlong nodeId, jobject addr)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
zts_get_rfc4193_addr(&ss, nwid, nodeId);
|
||||
return ss2inet(env, &ss);
|
||||
ss2zta(env, &ss, addr);
|
||||
}
|
||||
|
||||
JNIEXPORT jlong JNICALL Java_zerotier_ZeroTier_get_peer_count(
|
||||
@@ -180,11 +174,9 @@ namespace ZeroTier {
|
||||
return zts_get_peer_count();
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API int ZTCALL zts_get_peer_address(char *peer, const uint64_t nodeId);
|
||||
|
||||
/****************************************************************************/
|
||||
/* ZeroTier Socket API */
|
||||
/****************************************************************************/
|
||||
/* ZeroTier Socket API */
|
||||
/****************************************************************************/
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_socket(
|
||||
JNIEnv *env, jobject thisObj, jint family, jint type, jint protocol)
|
||||
@@ -196,10 +188,7 @@ namespace ZeroTier {
|
||||
JNIEnv *env, jobject thisObj, jint fd, jobject addr)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
if(sockinet2ss(env, addr, &ss) < 0) {
|
||||
return -1; // possibly invalid address format
|
||||
// TODO: set errno
|
||||
}
|
||||
zta2ss(env, &ss, addr);
|
||||
socklen_t addrlen = ss.ss_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
|
||||
return zts_connect(fd, (struct sockaddr *)&ss, addrlen);
|
||||
}
|
||||
@@ -209,14 +198,9 @@ namespace ZeroTier {
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
int err;
|
||||
if(sockinet2ss(env, addr, &ss) < 0) {
|
||||
return -1; // possibly invalid address format
|
||||
// TODO: set errno
|
||||
}
|
||||
//DEBUG_TEST("RESULT => %s : %d", inet_ntoa(in4->sin_addr), ntohs(in4->sin_port));
|
||||
zta2ss(env, &ss, addr);
|
||||
socklen_t addrlen = ss.ss_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
|
||||
err = zts_bind(fd, (struct sockaddr*)&ss, addrlen);
|
||||
return err;
|
||||
return zts_bind(fd, (struct sockaddr*)&ss, addrlen);
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_listen(
|
||||
@@ -229,26 +213,20 @@ namespace ZeroTier {
|
||||
JNIEnv *env, jobject thisObj, jint fd, jobject addr, jint port)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
int err;
|
||||
socklen_t addrlen = sizeof(struct sockaddr_storage);
|
||||
if ((err = zts_accept(fd, (struct sockaddr *)&ss, &addrlen)) < 0) {
|
||||
return err;
|
||||
}
|
||||
addr = ss2inet(env, &ss);
|
||||
int err = zts_accept(fd, (struct sockaddr *)&ss, &addrlen);
|
||||
ss2zta(env, &ss, addr);
|
||||
return err;
|
||||
}
|
||||
|
||||
#if defined(__linux__)
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_accept4(
|
||||
JNIEnv *env, jobject thisObj, jint fd, jobject addr, jint port, jint flags)
|
||||
JNIEnv *env, jobject thisObj, jint fd, jobject addr, jint port, jint flags)
|
||||
{
|
||||
struct sockaddr_storage ss;
|
||||
int err;
|
||||
socklen_t addrlen = sizeof(struct sockaddr_storage);
|
||||
if ((err = zts_accept4(fd, (struct sockaddr *)&ss, &addrlen, flags)) < 0) {
|
||||
return err;
|
||||
}
|
||||
addr = ss2inet(env, &ss);
|
||||
int err = zts_accept4(fd, (struct sockaddr *)&ss, &addrlen, flags);
|
||||
ss2zta(env, &ss, addr);
|
||||
return err;
|
||||
}
|
||||
#endif
|
||||
@@ -265,139 +243,99 @@ namespace ZeroTier {
|
||||
return zts_getsockopt(fd, level, optname, (void*)(uintptr_t)optval, (socklen_t *)optlen);
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_getsockname(JNIEnv *env, jobject thisObj,
|
||||
jint fd, jobject ztaddr)
|
||||
JNIEXPORT jboolean JNICALL Java_zerotier_ZeroTier_getsockname(JNIEnv *env, jobject thisObj,
|
||||
jint fd, jobject addr)
|
||||
{
|
||||
struct sockaddr_in addr;
|
||||
int err = zts_getsockname(fd, (struct sockaddr *)&addr, (socklen_t *)sizeof(struct sockaddr));
|
||||
jfieldID fid;
|
||||
jclass c = (*env).GetObjectClass(ztaddr);
|
||||
if (c) {
|
||||
fid = (*env).GetFieldID(c, "port", "I");
|
||||
(*env).SetIntField(ztaddr, fid, addr.sin_port);
|
||||
fid = (*env).GetFieldID(c,"_rawAddr", "J");
|
||||
(*env).SetLongField(ztaddr, fid,addr.sin_addr.s_addr);
|
||||
}
|
||||
struct sockaddr_storage ss;
|
||||
socklen_t addrlen = sizeof(struct sockaddr_storage);
|
||||
int err = zts_getsockname(fd, (struct sockaddr *)&ss, &addrlen);
|
||||
ss2zta(env, &ss, addr);
|
||||
return err;
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_getpeername(JNIEnv *env, jobject thisObj,
|
||||
jint fd, jobject ztaddr)
|
||||
jint fd, jobject addr)
|
||||
{
|
||||
struct sockaddr_in addr;
|
||||
int err = zts_getpeername(fd, (struct sockaddr *)&addr, (socklen_t *)sizeof(struct sockaddr));
|
||||
jfieldID fid;
|
||||
jclass c = (*env).GetObjectClass( ztaddr);
|
||||
if (c) {
|
||||
fid = (*env).GetFieldID(c, "port", "I");
|
||||
(*env).SetIntField(ztaddr, fid, addr.sin_port);
|
||||
fid = (*env).GetFieldID(c,"_rawAddr", "J");
|
||||
(*env).SetLongField(ztaddr, fid,addr.sin_addr.s_addr);
|
||||
}
|
||||
struct sockaddr_storage ss;
|
||||
int err = zts_getpeername(fd, (struct sockaddr *)&ss, (socklen_t *)sizeof(struct sockaddr_storage));
|
||||
ss2zta(env, &ss, addr);
|
||||
return err;
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API struct hostent *zts_gethostbyname(const char *name);
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_close(
|
||||
JNIEnv *env, jobject thisObj, jint fd)
|
||||
{
|
||||
return zts_close(fd);
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API int ZTCALL zts_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_fcntl(
|
||||
JNIEnv *env, jobject thisObj, jint fd, jint cmd, jint flags)
|
||||
{
|
||||
return zts_fcntl(fd, cmd, flags);
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API int ZTCALL zts_ioctl(int fd, unsigned long request, void *argp);
|
||||
JNIEXPORT int JNICALL Java_zerotier_ZeroTier_ioctl(jint fd, jlong request, void *argp)
|
||||
{
|
||||
return zts_ioctl(fd, request, argp);
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_send(JNIEnv *env, jobject thisObj, jint fd, jarray buf, jint len, int flags)
|
||||
{
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
char * bufp = (char *)malloc(sizeof(char)*len);
|
||||
memcpy(bufp, body, len);
|
||||
int w = zts_send(fd, body, len, flags);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
int written_bytes = zts_write(fd, body, len);
|
||||
return written_bytes;
|
||||
return w;
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_sendto(
|
||||
JNIEnv *env, jobject thisObj, jint fd, jarray buf, jint len, jint flags, jobject ztaddr)
|
||||
JNIEnv *env, jobject thisObj, jint fd, jarray buf, jint len, jint flags, jobject addr)
|
||||
{
|
||||
struct sockaddr_in addr;
|
||||
int sent_bytes = 0;
|
||||
jclass c = (*env).GetObjectClass( ztaddr);
|
||||
if (c) {
|
||||
jfieldID f = (*env).GetFieldID(c, "port", "I");
|
||||
addr.sin_port = htons((*env).GetIntField( ztaddr, f));
|
||||
f = (*env).GetFieldID(c, "_rawAddr", "J");
|
||||
addr.sin_addr.s_addr = (*env).GetLongField( ztaddr, f);
|
||||
addr.sin_family = AF_INET;
|
||||
//LOGV("zt_sendto(): fd = %d\naddr = %s\nport=%d", fd, inet_ntoa(addr.sin_addr), ntohs(addr.sin_port));
|
||||
// TODO: Optimize this
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
char * bufp = (char *)malloc(sizeof(char)*len);
|
||||
memcpy(bufp, body, len);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
// "connect" and send buffer contents
|
||||
sent_bytes = zts_sendto(fd, body, len, flags, (struct sockaddr *)&addr, sizeof(addr));
|
||||
}
|
||||
return sent_bytes;
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
struct sockaddr_storage ss;
|
||||
zta2ss(env, &ss, addr);
|
||||
socklen_t addrlen = ss.ss_family == AF_INET ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
|
||||
int w = zts_sendto(fd, body, len, flags, (struct sockaddr *)&ss, addrlen);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
return w;
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API ssize_t ZTCALL zts_sendmsg(int fd, const struct msghdr *msg, int flags);
|
||||
// TODO: ZT_SOCKET_API ssize_t ZTCALL zts_recv(int fd, void *buf, size_t len, int flags);
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_recv(JNIEnv *env, jobject thisObj,
|
||||
jint fd, jarray buf, jint len, jint flags)
|
||||
{
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
int r = zts_recv(fd, body, len, flags);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
return r;
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_recvfrom(
|
||||
JNIEnv *env, jobject thisObj, jint fd, jbyteArray buf, jint len, jint flags, jobject ztaddr)
|
||||
JNIEnv *env, jobject thisObj, jint fd, jbyteArray buf, jint len, jint flags, jobject addr)
|
||||
{
|
||||
/*
|
||||
struct sockaddr_in addr;
|
||||
jbyte *body = (*env).GetByteArrayElements( buf, 0);
|
||||
unsigned char buffer[ZT_SDK_MTU];
|
||||
int payload_offset = sizeof(int32_t) + sizeof(struct sockaddr_storage);
|
||||
int rxbytes = zts_recvfrom(fd, &buffer, len, flags, (struct sockaddr *)&addr, (socklen_t *)sizeof(struct sockaddr_storage));
|
||||
if (rxbytes > 0) {
|
||||
memcpy(body, (jbyte*)buffer + payload_offset, rxbytes);
|
||||
}
|
||||
(*env).ReleaseByteArrayElements( buf, body, 0);
|
||||
// Update fields of Java ZTAddress object
|
||||
jfieldID fid;
|
||||
jclass c = (*env).GetObjectClass( ztaddr);
|
||||
if (c) {
|
||||
fid = (*env).GetFieldID(c, "port", "I");
|
||||
(*env).SetIntField(ztaddr, fid, addr.sin_port);
|
||||
fid = (*env).GetFieldID(c,"_rawAddr", "J");
|
||||
(*env).SetLongField(ztaddr, fid,addr.sin_addr.s_addr);
|
||||
}
|
||||
*/
|
||||
return 1;
|
||||
socklen_t addrlen = sizeof(struct sockaddr_storage);
|
||||
struct sockaddr_storage ss;
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
int r = zts_recvfrom(fd, body, len, flags, (struct sockaddr *)&ss, &addrlen);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
ss2zta(env, &ss, addr);
|
||||
return r;
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API ssize_t ZTCALL zts_recvmsg(int fd, struct msghdr *msg,int flags);
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_read(JNIEnv *env, jobject thisObj,
|
||||
jint fd, jarray buf, jint len)
|
||||
{
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
int read_bytes = zts_read(fd, body, len);
|
||||
int r = zts_read(fd, body, len);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
return read_bytes;
|
||||
return r;
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_write(JNIEnv *env, jobject thisObj,
|
||||
jint fd, jarray buf, jint len)
|
||||
{
|
||||
jbyte *body = (*env).GetByteArrayElements((_jbyteArray *)buf, 0);
|
||||
char * bufp = (char *)malloc(sizeof(char)*len);
|
||||
memcpy(bufp, body, len);
|
||||
int w = zts_write(fd, body, len);
|
||||
(*env).ReleaseByteArrayElements((_jbyteArray *)buf, body, 0);
|
||||
int written_bytes = zts_write(fd, body, len);
|
||||
return written_bytes;
|
||||
return w;
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL Java_zerotier_ZeroTier_shutdown(
|
||||
@@ -405,113 +343,88 @@ namespace ZeroTier {
|
||||
{
|
||||
return zts_shutdown(fd, how);
|
||||
}
|
||||
|
||||
// TODO: ZT_SOCKET_API int ZTCALL zts_add_dns_nameserver(struct sockaddr *addr);
|
||||
// TODO: ZT_SOCKET_API int ZTCALL zts_del_dns_nameserver(struct sockaddr *addr);
|
||||
}
|
||||
|
||||
/****************************************************************************/
|
||||
/* Helpers (for moving data across the JNI barrier) */
|
||||
/****************************************************************************/
|
||||
|
||||
// convenience function
|
||||
jobject ss2inet(JNIEnv *env, struct sockaddr_storage *src_ss)
|
||||
void ss2zta(JNIEnv *env, struct sockaddr_storage *ss, jobject addr)
|
||||
{
|
||||
jobject dest_inet;
|
||||
if(src_ss->ss_family == AF_INET)
|
||||
{
|
||||
DEBUG_ERROR("converting from INET");
|
||||
struct sockaddr_in *in4 = (struct sockaddr_in*)src_ss;
|
||||
int arrlen = 4;
|
||||
jbyteArray bytes = (*env).NewByteArray(arrlen);
|
||||
jbyte *java_address_bytes;
|
||||
java_address_bytes = (*env).GetByteArrayElements(bytes, NULL);
|
||||
memcpy(java_address_bytes, &(in4->sin_addr.s_addr), arrlen);
|
||||
(*env).ReleaseByteArrayElements(bytes, java_address_bytes, 0);
|
||||
jclass cls = (*env).FindClass("java/net/InetAddress");
|
||||
jmethodID mid = (*env).GetStaticMethodID(cls, "getByAddress", "([B)Ljava/net/InetAddress;");
|
||||
dest_inet = (*env).CallStaticObjectMethod(cls, mid, bytes);
|
||||
(*env).DeleteLocalRef(bytes);
|
||||
}
|
||||
if(src_ss->ss_family == AF_INET6)
|
||||
{
|
||||
DEBUG_ERROR("converting from INET6");
|
||||
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)src_ss;
|
||||
int arrlen = 16;
|
||||
jbyteArray bytes = (*env).NewByteArray(arrlen);
|
||||
(*env).SetByteArrayRegion(bytes, 0, 16, (const jbyte *)&(in6->sin6_addr));
|
||||
jclass cls = (*env).FindClass("java/net/InetAddress");
|
||||
jmethodID mid = (*env).GetStaticMethodID(cls, "getByAddress", "([B)Ljava/net/InetAddress;");
|
||||
dest_inet = (*env).CallStaticObjectMethod(cls, mid, bytes);
|
||||
(*env).DeleteLocalRef(bytes);
|
||||
}
|
||||
return dest_inet;
|
||||
}
|
||||
|
||||
|
||||
int sockinet2ss(JNIEnv *env, jobject src_inet, struct sockaddr_storage *dest_ss)
|
||||
{
|
||||
struct sockaddr_in *in4 = (struct sockaddr_in*)dest_ss;
|
||||
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)dest_ss;
|
||||
int port = 0;
|
||||
int socket_family = 0;
|
||||
socklen_t addrlen;
|
||||
|
||||
// ---
|
||||
|
||||
jclass c = (*env).GetObjectClass(src_inet);
|
||||
jclass c = (*env).GetObjectClass(addr);
|
||||
if (!c) {
|
||||
return -1;
|
||||
return;
|
||||
}
|
||||
// get port
|
||||
jmethodID getPort = (*env).GetMethodID(c, "getPort", "()I");
|
||||
if (!getPort) {
|
||||
return -1;
|
||||
if(ss->ss_family == AF_INET)
|
||||
{
|
||||
struct sockaddr_in *in4 = (struct sockaddr_in*)ss;
|
||||
jfieldID fid = (*env).GetFieldID(c, "_port", "I");
|
||||
(*env).SetIntField(addr, fid, ntohs(in4->sin_port));
|
||||
fid = (*env).GetFieldID(c,"_family", "I");
|
||||
(*env).SetLongField(addr, fid, (in4->sin_family));
|
||||
fid = env->GetFieldID(c, "_ip4", "[B");
|
||||
jobject ipData = (*env).GetObjectField (addr, fid);
|
||||
jbyteArray * arr = reinterpret_cast<jbyteArray*>(&ipData);
|
||||
char *data = (char*)(*env).GetByteArrayElements(*arr, NULL);
|
||||
memcpy(data, &(in4->sin_addr.s_addr), 4);
|
||||
(*env).ReleaseByteArrayElements(*arr, (jbyte*)data, 0);
|
||||
|
||||
return;
|
||||
}
|
||||
port = (*env).CallIntMethod(src_inet, getPort);
|
||||
// get internal InetAddress
|
||||
jobject inetaddr;
|
||||
jmethodID getAddress = (*env).GetMethodID(c, "getAddress", "()Ljava/net/InetAddress;");
|
||||
if (!getAddress) {
|
||||
return -1;
|
||||
if(ss->ss_family == AF_INET6)
|
||||
{
|
||||
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)ss;
|
||||
jfieldID fid = (*env).GetFieldID(c, "_port", "I");
|
||||
(*env).SetIntField(addr, fid, ntohs(in6->sin6_port));
|
||||
fid = (*env).GetFieldID(c,"_family", "I");
|
||||
(*env).SetLongField(addr, fid, (in6->sin6_family));
|
||||
fid = env->GetFieldID(c, "_ip6", "[B");
|
||||
jobject ipData = (*env).GetObjectField (addr, fid);
|
||||
jbyteArray * arr = reinterpret_cast<jbyteArray*>(&ipData);
|
||||
char *data = (char*)(*env).GetByteArrayElements(*arr, NULL);
|
||||
memcpy(data, &(in6->sin6_addr.s6_addr), 16);
|
||||
(*env).ReleaseByteArrayElements(*arr, (jbyte*)data, 0);
|
||||
return;
|
||||
}
|
||||
inetaddr = (*env).CallObjectMethod(src_inet, getAddress);
|
||||
if (!inetaddr) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
void zta2ss(JNIEnv *env, struct sockaddr_storage *ss, jobject addr)
|
||||
{
|
||||
jclass c = (*env).GetObjectClass(addr);
|
||||
if (!c) {
|
||||
return;
|
||||
}
|
||||
jclass inetClass = (*env).GetObjectClass(inetaddr);
|
||||
if (!inetClass) {
|
||||
return -1;
|
||||
jfieldID fid = (*env).GetFieldID(c, "_family", "I");
|
||||
int family = (*env).GetIntField(addr, fid);
|
||||
if (family == AF_INET)
|
||||
{
|
||||
struct sockaddr_in *in4 = (struct sockaddr_in*)ss;
|
||||
fid = (*env).GetFieldID(c, "_port", "I");
|
||||
in4->sin_port = htons((*env).GetIntField(addr, fid));
|
||||
in4->sin_family = AF_INET;
|
||||
fid = env->GetFieldID(c, "_ip4", "[B");
|
||||
jobject ipData = (*env).GetObjectField (addr, fid);
|
||||
jbyteArray * arr = reinterpret_cast<jbyteArray*>(&ipData);
|
||||
char *data = (char*)(*env).GetByteArrayElements(*arr, NULL);
|
||||
memcpy(&(in4->sin_addr.s_addr), data, 4);
|
||||
(*env).ReleaseByteArrayElements(*arr, (jbyte*)data, 0);
|
||||
return;
|
||||
}
|
||||
// string representation of IP address
|
||||
jmethodID getHostAddress = (*env).GetMethodID(inetClass, "getHostAddress", "()Ljava/lang/String;");
|
||||
jstring addrstr = (jstring)(*env).CallObjectMethod(inetaddr, getHostAddress);
|
||||
const char *addr_str = (*env).GetStringUTFChars(addrstr, NULL);
|
||||
for (int i=0; i<strlen(addr_str); i++) {
|
||||
if (addr_str[i]=='.') {
|
||||
DEBUG_INFO("ipv4, inet_addr");
|
||||
socket_family = AF_INET;
|
||||
in4->sin_family = AF_INET;
|
||||
in4->sin_port = htons(port);
|
||||
in4->sin_addr.s_addr = inet_addr(addr_str);
|
||||
/*
|
||||
if (!inet_pton(AF_INET, addr_str, &(in4->sin_addr))) {
|
||||
DEBUG_ERROR("error converting address %s", addr_str);
|
||||
}
|
||||
*/
|
||||
addrlen = sizeof(struct sockaddr_in);
|
||||
break;
|
||||
}
|
||||
if (addr_str[i]==':') {
|
||||
DEBUG_INFO("ipv6");
|
||||
socket_family = AF_INET6;
|
||||
if (!inet_pton(AF_INET6, addr_str, &(in6->sin6_addr))) {
|
||||
DEBUG_ERROR("error converting address %s", addr_str);
|
||||
}
|
||||
addrlen = sizeof(struct sockaddr_in6);
|
||||
break;
|
||||
}
|
||||
if (family == AF_INET6)
|
||||
{
|
||||
struct sockaddr_in6 *in6 = (struct sockaddr_in6*)ss;
|
||||
jfieldID fid = (*env).GetFieldID(c, "_port", "I");
|
||||
in6->sin6_port = htons((*env).GetIntField(addr, fid));
|
||||
fid = (*env).GetFieldID(c,"_family", "I");
|
||||
in6->sin6_family = AF_INET6;
|
||||
fid = env->GetFieldID(c, "_ip6", "[B");
|
||||
jobject ipData = (*env).GetObjectField (addr, fid);
|
||||
jbyteArray * arr = reinterpret_cast<jbyteArray*>(&ipData);
|
||||
char *data = (char*)(*env).GetByteArrayElements(*arr, NULL);
|
||||
memcpy(&(in6->sin6_addr.s6_addr), data, 16);
|
||||
(*env).ReleaseByteArrayElements(*arr, (jbyte*)data, 0);
|
||||
return;
|
||||
}
|
||||
(*env).ReleaseStringUTFChars(addrstr, addr_str);
|
||||
DEBUG_TEST("RESULT => %s : %d", inet_ntoa(in4->sin_addr), ntohs(in4->sin_port));
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
Reference in New Issue
Block a user