diff options
author | Grant Limberg <grant.limberg@zerotier.com> | 2017-07-12 11:34:53 -0700 |
---|---|---|
committer | Grant Limberg <grant.limberg@zerotier.com> | 2017-07-12 11:34:53 -0700 |
commit | d8f1c3dff73277000b1c4fe0f8e6dc169576a880 (patch) | |
tree | cc2fbe5b80cae2d56bad632bd039e7d475eb619b /java/src/com/zerotier/sdk | |
parent | 0a11dd2d24680d4ee56a6343ba0b276be528d40b (diff) | |
download | infinitytier-d8f1c3dff73277000b1c4fe0f8e6dc169576a880.tar.gz infinitytier-d8f1c3dff73277000b1c4fe0f8e6dc169576a880.zip |
Update JNI code to reflect new ZeroTier API
Diffstat (limited to 'java/src/com/zerotier/sdk')
-rw-r--r-- | java/src/com/zerotier/sdk/DataStoreGetListener.java | 8 | ||||
-rw-r--r-- | java/src/com/zerotier/sdk/PacketSender.java | 4 | ||||
-rw-r--r-- | java/src/com/zerotier/sdk/PathChecker.java | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/java/src/com/zerotier/sdk/DataStoreGetListener.java b/java/src/com/zerotier/sdk/DataStoreGetListener.java index b525be63..317511e0 100644 --- a/java/src/com/zerotier/sdk/DataStoreGetListener.java +++ b/java/src/com/zerotier/sdk/DataStoreGetListener.java @@ -46,13 +46,9 @@ public interface DataStoreGetListener { * * @param name Name of the object in the data store * @param out_buffer buffer to put the object in - * @param bufferIndex index in the object to start reading - * @param out_objectSize long[1] to be set to the actual size of the object if it exists. - * @return the actual number of bytes read. + * @return size of the object */ public long onDataStoreGet( String name, - byte[] out_buffer, - long bufferIndex, - long[] out_objectSize); + byte[] out_buffer); } diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java index 22893ec7..06ec01bc 100644 --- a/java/src/com/zerotier/sdk/PacketSender.java +++ b/java/src/com/zerotier/sdk/PacketSender.java @@ -37,13 +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 localAddr {@link InetSocketAddress} to send from. Set to null if not specified. + * @param localSocket socket file descriptor to send from. Set to -1 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 localAddr, + long localSocket, InetSocketAddress remoteAddr, byte[] packetData, int ttl); diff --git a/java/src/com/zerotier/sdk/PathChecker.java b/java/src/com/zerotier/sdk/PathChecker.java index 3e02f112..6bf31df2 100644 --- a/java/src/com/zerotier/sdk/PathChecker.java +++ b/java/src/com/zerotier/sdk/PathChecker.java @@ -26,10 +26,10 @@ public interface PathChecker { * such as network containers or embedded. * * @param ztAddress ZeroTier address or 0 for none/any - * @param localAddress Local interface address + * @param localSocket Local interface socket. -1 if unspecified * @param remoteAddress remote address */ - boolean onPathCheck(long ztAddress, InetSocketAddress localAddress, InetSocketAddress remoteAddress); + boolean onPathCheck(long ztAddress, long localSocket, InetSocketAddress remoteAddress); /** * Function to get physical addresses for ZeroTier peers |