diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-16 11:13:02 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-16 11:13:02 -0800 |
| commit | f5b465c0e1e16a32e1593a349219122c4f5e2126 (patch) | |
| tree | d2c764dfd156574425fbc19b9151e9397d66f1e9 | |
| parent | 6ac70ba80839e152b84c48a133464058863deb6a (diff) | |
| parent | 75f8ee1b9c25403b7fbd42b901d98ddbce7f89f5 (diff) | |
| download | infinitytier-f5b465c0e1e16a32e1593a349219122c4f5e2126.tar.gz infinitytier-f5b465c0e1e16a32e1593a349219122c4f5e2126.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
| -rw-r--r-- | java/jni/com_zerotierone_sdk_Node.cpp | 5 | ||||
| -rw-r--r-- | java/src/com/zerotier/sdk/PacketSender.java | 3 | ||||
| -rw-r--r-- | node/Topology.cpp | 4 | ||||
| -rw-r--r-- | node/Topology.hpp | 2 |
4 files changed, 8 insertions, 6 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"); 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); } diff --git a/node/Topology.cpp b/node/Topology.cpp index 1617dd94..3d1db337 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -128,8 +128,8 @@ SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &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 a9a5f2f9..07daa276 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 |