From 0b9e5928d35c43748d8cd413e05e5718f7b1fc52 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 26 Sep 2015 13:53:38 -0700
Subject: update PacketSender interface

---
 java/src/com/zerotier/sdk/PacketSender.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'java/src/com/zerotier/sdk/PacketSender.java')

diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java
index 5302f5ce..ab31729b 100644
--- a/java/src/com/zerotier/sdk/PacketSender.java
+++ b/java/src/com/zerotier/sdk/PacketSender.java
@@ -37,11 +37,13 @@ public interface PacketSender {
      * on failure. Note that success does not (of course) guarantee packet
      * delivery. It only means that the packet appears to have been sent.</p>
      *
-     * @param addr {@link InetSocketAddress} to send to
+     * @param localAddr {@link InetSocketAddress} to send from.  Set to null if not specified.
+     * @param remoteAddr {@link InetSocketAddress} to send to
      * @param packetData data to send
      * @return 0 on success, any error code on failure.
      */
     public int onSendPacketRequested(
-            InetSocketAddress addr,
+            InetSocketAddress localAddr,
+            InetSocketAddress remoteAddr,
             byte[] packetData);
 }
-- 
cgit v1.2.3


From 0508a41afddce1b81921a0eeb9e03f28d0f04742 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 14 Nov 2015 17:40:17 -0800
Subject: added ttl parameter to WirePacketSendFunction

---
 java/jni/com_zerotierone_sdk_Node.cpp       | 5 +++--
 java/src/com/zerotier/sdk/PacketSender.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'java/src/com/zerotier/sdk/PacketSender.java')

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");
diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java
index ab31729b..22893ec7 100644
--- a/java/src/com/zerotier/sdk/PacketSender.java
+++ b/java/src/com/zerotier/sdk/PacketSender.java
@@ -45,5 +45,6 @@ public interface PacketSender {
     public int onSendPacketRequested(
             InetSocketAddress localAddr,
             InetSocketAddress remoteAddr,
-            byte[] packetData);
+            byte[] packetData,
+            int ttl);
 }
-- 
cgit v1.2.3