diff options
| -rw-r--r-- | java/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | java/jni/com_zerotierone_sdk_Node.cpp | 8 | ||||
| -rw-r--r-- | java/jni/com_zerotierone_sdk_Node.h | 4 | ||||
| -rw-r--r-- | java/src/com/zerotier/one/OneService.java | 5 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/Node.java | 5 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/PacketSender.java | 2 |
6 files changed, 10 insertions, 18 deletions
diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 9c06ce45..db3eec1c 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -73,7 +73,9 @@ include_directories( add_library(${PROJECT_NAME} SHARED ${src_files}) -set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".jnilib") +if(APPLE) + set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".jnilib") +endif() set(link_libs ) diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index 55eec9a6..65ec364b 100644 --- a/java/jni/com_zerotierone_sdk_Node.cpp +++ b/java/jni/com_zerotierone_sdk_Node.cpp @@ -403,7 +403,6 @@ namespace { int WirePacketSendFunction(ZT1_Node *node,void *userData,\ const struct sockaddr_storage *address, - unsigned int linkDesparation, const void *buffer, unsigned int bufferSize) { @@ -422,7 +421,7 @@ namespace { } jmethodID packetSenderCallbackMethod = cache.findMethod(packetSenderClass, - "onSendPacketRequested", "(Ljava/net/InetSocketAddress;I[B)I"); + "onSendPacketRequested", "(Ljava/net/InetSocketAddress;[B)I"); if(packetSenderCallbackMethod == NULL) { LOGE("Couldn't find onSendPacketRequested method"); @@ -432,7 +431,7 @@ namespace { jobject addressObj = newInetSocketAddress(env, *address); jbyteArray bufferObj = env->NewByteArray(bufferSize); env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer); - return env->CallIntMethod(ref->packetSender, packetSenderCallbackMethod, addressObj, linkDesparation, bufferObj); + return env->CallIntMethod(ref->packetSender, packetSenderCallbackMethod, addressObj, bufferObj); } typedef std::map<uint64_t, JniRef*> NodeMap; @@ -700,7 +699,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket( jlong id, jlong in_now, jobject in_remoteAddress, - jint in_linkDesparation, jbyteArray in_packetData, jlongArray out_nextBackgroundTaskDeadline) { @@ -719,7 +717,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket( } uint64_t now = (uint64_t)in_now; - unsigned int linkDesparation = (unsigned int)in_linkDesparation; // get the java.net.InetSocketAddress class and getAddress() method jclass inetAddressClass = cache.findClass("java/net/InetAddress"); @@ -801,7 +798,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket( node, now, &remoteAddress, - linkDesparation, packetData, packetLength, &nextBackgroundTaskDeadline); diff --git a/java/jni/com_zerotierone_sdk_Node.h b/java/jni/com_zerotierone_sdk_Node.h index a55c6702..6b41b02a 100644 --- a/java/jni/com_zerotierone_sdk_Node.h +++ b/java/jni/com_zerotierone_sdk_Node.h @@ -34,10 +34,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame /* * Class: com_zerotier_sdk_Node * Method: processWirePacket - * Signature: (JJLjava/net/InetSockAddress;I[B[J)Lcom/zerotier/sdk/ResultCode; + * Signature: (JJLjava/net/InetSockAddress;[B[J)Lcom/zerotier/sdk/ResultCode; */ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket - (JNIEnv *, jobject, jlong, jlong, jobject, jint, jbyteArray, jlongArray); + (JNIEnv *, jobject, jlong, jlong, jobject, jbyteArray, jlongArray); /* * Class: com_zerotier_sdk_Node diff --git a/java/src/com/zerotier/one/OneService.java b/java/src/com/zerotier/one/OneService.java index 0477b54d..1d3e34c8 100644 --- a/java/src/com/zerotier/one/OneService.java +++ b/java/src/com/zerotier/one/OneService.java @@ -75,7 +75,7 @@ public class OneService extends Thread implements Runnable, PacketSender, { System.out.println("Got Data From: " + p.getAddress().toString() +":" + p.getPort()); - _node.processWirePacket(System.currentTimeMillis(), new InetSocketAddress(p.getAddress(), p.getPort()), 0, p.getData(), bgtask); + _node.processWirePacket(System.currentTimeMillis(), new InetSocketAddress(p.getAddress(), p.getPort()), p.getData(), bgtask); _nextBackgroundTaskDeadline = bgtask[0]; } } catch (SocketTimeoutException e) {} @@ -148,8 +148,7 @@ public class OneService extends Thread implements Runnable, PacketSender, } @Override - public int onSendPacketRequested(InetSocketAddress addr, - int linkDesperation, byte[] packetData) { + public int onSendPacketRequested(InetSocketAddress addr, byte[] packetData) { System.out.println("onSendPacketRequested to: " + addr.getHostString() +":"+ addr.getPort() + " "); if(_udpSocket == null) diff --git a/java/src/com/zerotier/sdk/Node.java b/java/src/com/zerotier/sdk/Node.java index c7581ca4..34af0d01 100644 --- a/java/src/com/zerotier/sdk/Node.java +++ b/java/src/com/zerotier/sdk/Node.java @@ -163,7 +163,6 @@ public class Node { * * @param now Current clock in milliseconds * @param remoteAddress Origin of packet - * @param linkDesperation Link desperation metric for link or protocol over which packet arrived * @param packetData Packet data * @param nextBackgroundTaskDeadline Value/result: set to deadline for next call to processBackgroundTasks() * @return OK (0) or error code if a fatal error condition has occurred @@ -171,11 +170,10 @@ public class Node { public ResultCode processWirePacket( long now, InetSocketAddress remoteAddress, - int linkDesperation, byte[] packetData, long[] nextBackgroundTaskDeadline) { return processWirePacket( - nodeId, now, remoteAddress, linkDesperation, packetData, + nodeId, now, remoteAddress, packetData, nextBackgroundTaskDeadline); } @@ -396,7 +394,6 @@ public class Node { long nodeId, long now, InetSocketAddress remoteAddress, - int linkDesperation, byte[] packetData, long[] nextBackgroundTaskDeadline); diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java index d038b11d..5302f5ce 100644 --- a/java/src/com/zerotier/sdk/PacketSender.java +++ b/java/src/com/zerotier/sdk/PacketSender.java @@ -38,12 +38,10 @@ public interface PacketSender { * delivery. It only means that the packet appears to have been sent.</p> * * @param addr {@link InetSocketAddress} to send to - * @param linkDesperation * @param packetData data to send * @return 0 on success, any error code on failure. */ public int onSendPacketRequested( InetSocketAddress addr, - int linkDesperation, byte[] packetData); } |