dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'adamierymenko-dev' into android-jni-dev

Browse source 
also update for changed function calls that now accept a local address

# Conflicts:
#	include/ZeroTierOne.h
#	java/CMakeLists.txt
#	java/jni/Android.mk
#	java/jni/ZT1_jnicache.cpp
#	java/jni/ZT1_jnilookup.h
#	java/jni/ZT1_jniutils.cpp
#	java/jni/com_zerotierone_sdk_Node.cpp
This commit is contained in:
Grant Limberg 2015-09-26 13:47:55 -07:00
commit e8cdff3eaf
55 changed files with 2968 additions and 1385 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/zerotier/sdk/Node.java
View file

@ -169,11 +169,12 @@ public class Node {
*/
public ResultCode processWirePacket(
long now,
InetSocketAddress localAddress,
InetSocketAddress remoteAddress,
byte[] packetData,
long[] nextBackgroundTaskDeadline) {
return processWirePacket(
nodeId, now, remoteAddress, packetData,
nodeId, now, localAddress, remoteAddress, packetData,
nextBackgroundTaskDeadline);
}
@ -393,6 +394,7 @@ public class Node {
private native ResultCode processWirePacket(
long nodeId,
long now,
InetSocketAddress localAddress,
InetSocketAddress remoteAddress,
byte[] packetData,
long[] nextBackgroundTaskDeadline);

2
java/src/com/zerotier/sdk/VirtualNetworkConfig.java
View file

@ -35,7 +35,7 @@ import java.net.InetSocketAddress;
public final class VirtualNetworkConfig implements Comparable<VirtualNetworkConfig> {
public static final int MAX_MULTICAST_SUBSCRIPTIONS = 4096;
public static final int ZT1_MAX_ZT_ASSIGNED_ADDRESSES = 16;
public static final int ZT_MAX_ZT_ASSIGNED_ADDRESSES = 16;
private long nwid;
private long mac;