summaryrefslogtreecommitdiff
path: root/java/jni
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-11-16 11:13:02 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-11-16 11:13:02 -0800
commitf5b465c0e1e16a32e1593a349219122c4f5e2126 (patch)
treed2c764dfd156574425fbc19b9151e9397d66f1e9 /java/jni
parent6ac70ba80839e152b84c48a133464058863deb6a (diff)
parent75f8ee1b9c25403b7fbd42b901d98ddbce7f89f5 (diff)
downloadinfinitytier-f5b465c0e1e16a32e1593a349219122c4f5e2126.tar.gz
infinitytier-f5b465c0e1e16a32e1593a349219122c4f5e2126.zip
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
Diffstat (limited to 'java/jni')
-rw-r--r--java/jni/com_zerotierone_sdk_Node.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 17a9917a..2c1b6807 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -427,7 +427,8 @@ namespace {
const struct sockaddr_storage *localAddress,
const struct sockaddr_storage *remoteAddress,
const void *buffer,
- unsigned int bufferSize)
+ unsigned int bufferSize,
+ unsigned int ttl)
{
LOGV("WirePacketSendFunction(%p, %p, %p, %d)", localAddress, remoteAddress, buffer, bufferSize);
JniRef *ref = (JniRef*)userData;
@@ -445,7 +446,7 @@ namespace {
}
jmethodID packetSenderCallbackMethod = lookup.findMethod(packetSenderClass,
- "onSendPacketRequested", "(Ljava/net/InetSocketAddress;Ljava/net/InetSocketAddress;[B)I");
+ "onSendPacketRequested", "(Ljava/net/InetSocketAddress;Ljava/net/InetSocketAddress;[BI)I");
if(packetSenderCallbackMethod == NULL)
{
LOGE("Couldn't find onSendPacketRequested method");