ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-27 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge

Browse Source
This commit is contained in:
Adam Ierymenko 2015-11-16 11:13:02 -08:00
commit f5b465c0e1
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -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");

3
java/src/com/zerotier/sdk/PacketSender.java
View File

@ -45,5 +45,6 @@ public interface PacketSender {
public int onSendPacketRequested(
InetSocketAddress localAddr,
InetSocketAddress remoteAddr,
byte[] packetData);
byte[] packetData,
int ttl);
}