diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp index 17a9917a9..2c1b68071 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 ab31729be..22893ec73 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); } diff --git a/node/Topology.cpp b/node/Topology.cpp index 1617dd94f..3d1db3379 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -128,8 +128,8 @@ SharedPtr Topology::addPeer(const SharedPtr &peer) #ifdef ZT_TRACE if ((!peer)||(peer->address() == RR->identity.address())) { if (!peer) - fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add NULL peer"ZT_EOL_S); - else fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add peer for self"ZT_EOL_S); + fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add NULL peer" ZT_EOL_S); + else fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add peer for self" ZT_EOL_S); abort(); } #endif diff --git a/node/Topology.hpp b/node/Topology.hpp index a9a5f2f99..07daa2764 100644 --- a/node/Topology.hpp +++ b/node/Topology.hpp @@ -239,7 +239,7 @@ public: while (i.next(a,p)) { #ifdef ZT_TRACE if (!(*p)) { - fprintf(stderr,"FATAL BUG: eachPeer() caught NULL peer for %s -- peer pointers in Topology should NEVER be NULL"ZT_EOL_S,a->toString().c_str()); + fprintf(stderr,"FATAL BUG: eachPeer() caught NULL peer for %s -- peer pointers in Topology should NEVER be NULL" ZT_EOL_S,a->toString().c_str()); abort(); } #endif