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

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

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);
 }

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

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