ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-28 00:38:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Ierymenko 2015-11-16 11:13:02 -08:00
commit f5b465c0e1
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/jni/com_zerotierone_sdk_Node.cpp
View File

@ -427,7 +427,8 @@ namespace {
const struct sockaddr_storage *localAddress, const struct sockaddr_storage *localAddress,
const struct sockaddr_storage *remoteAddress, const struct sockaddr_storage *remoteAddress,
const void *buffer, const void *buffer,
unsigned int bufferSize) unsigned int bufferSize,
unsigned int ttl)
{ {
LOGV("WirePacketSendFunction(%p, %p, %p, %d)", localAddress, remoteAddress, buffer, bufferSize); LOGV("WirePacketSendFunction(%p, %p, %p, %d)", localAddress, remoteAddress, buffer, bufferSize);
JniRef *ref = (JniRef*)userData; JniRef *ref = (JniRef*)userData;
@ -445,7 +446,7 @@ namespace {
} }
jmethodID packetSenderCallbackMethod = lookup.findMethod(packetSenderClass, 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) if(packetSenderCallbackMethod == NULL)
{ {
LOGE("Couldn't find onSendPacketRequested method"); LOGE("Couldn't find onSendPacketRequested method");

3
java/src/com/zerotier/sdk/PacketSender.java
View File

@ -45,5 +45,6 @@ public interface PacketSender {
public int onSendPacketRequested( public int onSendPacketRequested(
InetSocketAddress localAddr, InetSocketAddress localAddr,
InetSocketAddress remoteAddr, InetSocketAddress remoteAddr,
byte[] packetData); byte[] packetData,
int ttl);
} }

4
node/Topology.cpp
View File

@ -128,8 +128,8 @@ SharedPtr<Peer> Topology::addPeer(const SharedPtr<Peer> &peer)
#ifdef ZT_TRACE #ifdef ZT_TRACE
if ((!peer)||(peer->address() == RR->identity.address())) { if ((!peer)||(peer->address() == RR->identity.address())) {
if (!peer) if (!peer)
fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add NULL peer"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); else fprintf(stderr,"FATAL BUG: addPeer() caught attempt to add peer for self" ZT_EOL_S);
abort(); abort();
} }
#endif #endif

2
node/Topology.hpp
View File

@ -239,7 +239,7 @@ public:
while (i.next(a,p)) { while (i.next(a,p)) {
#ifdef ZT_TRACE #ifdef ZT_TRACE
if (!(*p)) { 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(); abort();
} }
#endif #endif