From 1e043a3f66c5ae7d9c1043be3244d605cbaa64fa Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 21 May 2015 19:34:19 -0700 Subject: Remove link desperation from java API --- java/jni/com_zerotierone_sdk_Node.cpp | 8 ++------ java/jni/com_zerotierone_sdk_Node.h | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'java/jni') 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 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 -- cgit v1.2.3