From 8fb9df97511532a28ac8225282318dd1f31be0e4 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 3 Jun 2015 18:35:38 -0700
Subject: delete dead test code

---
 java/src/com/zerotier/one/AndroidFileProvider.java |  43 -----
 java/src/com/zerotier/one/DataStore.java           |  73 --------
 .../com/zerotier/one/DataStoreFileProvider.java    |  12 --
 java/src/com/zerotier/one/JavaFileProvider.java    |  46 -----
 java/src/com/zerotier/one/OneService.java          | 204 ---------------------
 5 files changed, 378 deletions(-)
 delete mode 100644 java/src/com/zerotier/one/AndroidFileProvider.java
 delete mode 100644 java/src/com/zerotier/one/DataStore.java
 delete mode 100644 java/src/com/zerotier/one/DataStoreFileProvider.java
 delete mode 100644 java/src/com/zerotier/one/JavaFileProvider.java
 delete mode 100644 java/src/com/zerotier/one/OneService.java

(limited to 'java')

diff --git a/java/src/com/zerotier/one/AndroidFileProvider.java b/java/src/com/zerotier/one/AndroidFileProvider.java
deleted file mode 100644
index 0988f9df..00000000
--- a/java/src/com/zerotier/one/AndroidFileProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.zerotier.one;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import android.content.Context;
-import android.util.Log;
-
-public class AndroidFileProvider implements DataStoreFileProvider {
-	private static final String TAG = "AndroidFileProvider";
-
-	Context _ctx;
-		
-	public AndroidFileProvider(Context ctx) {
-		this._ctx = ctx;
-	}
-
-	@Override
-	public FileInputStream getInputFileStream(String name)
-			throws FileNotFoundException {
-		Log.d(TAG, "Returning FileInputStream for: " + name);
-		return _ctx.openFileInput(name);
-	}
-
-	@Override
-	public FileOutputStream getOutputFileStream(String name)
-			throws FileNotFoundException {
-		Log.d(TAG, "Returning FileOutputStream for: " + name);
-		return _ctx.openFileOutput(name, Context.MODE_PRIVATE);
-	}
-
-	@Override
-	public void deleteFile(String name) throws IOException {
-		boolean success = _ctx.deleteFile(name);
-		if(!success)
-		{
-			throw new IOException("Unable to delete file.");
-		}
-	}
-
-}
diff --git a/java/src/com/zerotier/one/DataStore.java b/java/src/com/zerotier/one/DataStore.java
deleted file mode 100644
index d15b2d3d..00000000
--- a/java/src/com/zerotier/one/DataStore.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.zerotier.one;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import com.zerotier.sdk.DataStoreGetListener;
-import com.zerotier.sdk.DataStorePutListener;
-
-public class DataStore implements DataStoreGetListener, DataStorePutListener {
-
-	private DataStoreFileProvider _provider;
-
-	public DataStore(DataStoreFileProvider provider) {
-		this._provider = provider;
-	}
-	
-	@Override
-	public int onDataStorePut(String name, byte[] buffer, boolean secure) {
-		System.out.println("Writing File: " + name);
-		try {
-			FileOutputStream fos = _provider.getOutputFileStream(name);
-            fos.write(buffer);
-            fos.close();
-            return 0;
-		} catch (FileNotFoundException fnf) {
-			fnf.printStackTrace();
-			return -1;
-		} catch (IOException io) {
-			io.printStackTrace();
-			return -2;
-		}
-	}
-
-	@Override
-	public int onDelete(String name) {
-		System.out.println("Deleting File: " + name);
-		try {
-			_provider.deleteFile(name);
-			return 0;
-		} catch (IOException ex) {
-			ex.printStackTrace();
-			return -1;
-		}
-	}
-
-	@Override
-	public long onDataStoreGet(String name, byte[] out_buffer,
-			long bufferIndex, long[] out_objectSize) {
-		System.out.println("Reading File: " + name);
-		try {
-            FileInputStream fin = _provider.getInputFileStream(name);
-			out_objectSize[0] = fin.getChannel().size();
-            if(bufferIndex > 0)
-            {
-                fin.skip(bufferIndex);
-            }
-            int read = fin.read(out_buffer);
-            fin.close();
-            return read;
-		} catch (FileNotFoundException fnf) {
-			// Can't read a file that doesn't exist!
-			out_objectSize[0] = 0;
-			return 0;
-		} catch (IOException io) {
-			io.printStackTrace();
-			return -2;
-		}
-	}
-	
-
-}
diff --git a/java/src/com/zerotier/one/DataStoreFileProvider.java b/java/src/com/zerotier/one/DataStoreFileProvider.java
deleted file mode 100644
index ffe078eb..00000000
--- a/java/src/com/zerotier/one/DataStoreFileProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zerotier.one;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public interface DataStoreFileProvider {
-	FileInputStream getInputFileStream(String name) throws FileNotFoundException;
-	FileOutputStream getOutputFileStream(String name) throws FileNotFoundException;
-	void deleteFile(String name) throws IOException;
-}
diff --git a/java/src/com/zerotier/one/JavaFileProvider.java b/java/src/com/zerotier/one/JavaFileProvider.java
deleted file mode 100644
index 41889e2f..00000000
--- a/java/src/com/zerotier/one/JavaFileProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.zerotier.one;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class JavaFileProvider implements DataStoreFileProvider {
-	private String _path;
-
-	public JavaFileProvider(String path) {
-		this._path = path;
-	}
-	
-	@Override
-	public FileInputStream getInputFileStream(String name)
-			throws FileNotFoundException {
-		File f = new File(_path + File.separator + name);
-		return new FileInputStream(f);
-	}
-
-	@Override
-	public FileOutputStream getOutputFileStream(String name)
-			throws FileNotFoundException {
-		File f = new File(_path + File.separator + name);
-		if(!f.exists())
-		{
-			try {
-				f.createNewFile();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return new FileOutputStream(f);
-	}
-
-	@Override
-	public void deleteFile(String name) throws IOException {
-		File f = new File(_path + File.separator + name);
-		boolean success = f.delete();
-		if(!success) {
-			throw new IOException("Unable to delete file: " + _path + File.pathSeparator + name);
-		}
-	}
-}
diff --git a/java/src/com/zerotier/one/OneService.java b/java/src/com/zerotier/one/OneService.java
deleted file mode 100644
index 1d3e34c8..00000000
--- a/java/src/com/zerotier/one/OneService.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-
-
-package com.zerotier.one;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-
-import com.zerotier.sdk.Event;
-import com.zerotier.sdk.EventListener;
-import com.zerotier.sdk.Node;
-import com.zerotier.sdk.PacketSender;
-import com.zerotier.sdk.ResultCode;
-import com.zerotier.sdk.Version;
-import com.zerotier.sdk.VirtualNetworkConfig;
-import com.zerotier.sdk.VirtualNetworkConfigListener;
-import com.zerotier.sdk.VirtualNetworkConfigOperation;
-import com.zerotier.sdk.VirtualNetworkFrameListener;
-
-public class OneService extends Thread implements Runnable, PacketSender,
-								   EventListener, VirtualNetworkConfigListener, 
-								   VirtualNetworkFrameListener {
-	private Node _node;
-	private int _port;
-
-	private DatagramSocket _udpSocket;
-	private ServerSocket _tcpSocket;
-	private DataStore _ds;
-	private long _nextBackgroundTaskDeadline = 0;
-	
-	private final Thread _udpReceiveThread = new Thread() {
-		@Override
-		public void run() {
-			try {
-				long[] bgtask = new long[1];
-				byte[] buffer = new byte[16384];
-				while(true) {
-	    			
-	    			bgtask[0] = 0;
-	    			DatagramPacket p = new DatagramPacket(buffer, buffer.length);
-	    			
-	    			try {
-	    				_udpSocket.receive(p);
-	    				if(p.getLength() > 0)
-		    			{
-		    				System.out.println("Got Data From: " + p.getAddress().toString() +":" + p.getPort());
-		    				
-		    				_node.processWirePacket(System.currentTimeMillis(), new InetSocketAddress(p.getAddress(), p.getPort()), p.getData(), bgtask);
-		    				_nextBackgroundTaskDeadline = bgtask[0];
-		    			}
-	    			} catch (SocketTimeoutException e) {}
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	};
-	
-	
-	public OneService(DataStoreFileProvider prov, int port) {
-		this._port = port;
-		this._ds = new DataStore(prov);
-		
-		try {
-			_udpSocket = new DatagramSocket(_port);
-			_udpSocket.setSoTimeout(100);
-			_tcpSocket = new ServerSocket();
-			_tcpSocket.bind(new InetSocketAddress("127.0.0.1", _port));
-		} catch (SocketException e) {
-			e.printStackTrace();
-			return;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return;
-		}
-		
-		_udpReceiveThread.start();
-		
-		_node = new Node(
-				System.currentTimeMillis(),
-				_ds,
-				_ds,
-				this,
-				this,
-				this,
-				this);
-	}
-
-	@Override
-	public void run() {
-		if(_node == null)
-			return;
-		
-		while(true) {
-		    try {
-		
-		        long dl = _nextBackgroundTaskDeadline;
-		        long now = System.currentTimeMillis();
-		
-		        if (dl <= now) {
-		            long[] returnDeadline = {0};
-		            ResultCode rc = _node.processBackgroundTasks(now, returnDeadline);
-		            _nextBackgroundTaskDeadline = returnDeadline[0];
-		            
-		            if(rc != ResultCode.RESULT_OK) {
-		            	System.out.println(rc.toString());
-		            }
-		        }
-		        
-		        long delay = (dl > now) ? (dl - now) : 100;
-		        Thread.sleep(delay);
-		
-		    } catch (Exception ex) {
-		    	System.out.println("Exception in run loop: " + ex.getMessage());
-		    	ex.printStackTrace();
-		    }
-        }
-	}
-
-	@Override
-	public int onSendPacketRequested(InetSocketAddress addr, byte[] packetData) {
-		System.out.println("onSendPacketRequested to: " + addr.getHostString() +":"+ addr.getPort() + " ");
-
-    	if(_udpSocket == null)
-    		return -1;
-    	try {
-    		DatagramPacket p = new DatagramPacket(packetData, packetData.length, addr);
-    		_udpSocket.send(p);
-    		System.out.println("Sent");
-    	} catch (Exception e) {
-    		System.out.println("Error sending datagram: " + e.getMessage());
-    		return -1;
-    	}
-        return 0;
-	}
-
-	@Override
-	public void onVirtualNetworkFrame(long nwid, long srcMac, long destMac,
-			long etherType, long vlanId, byte[] frameData) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public int onNetworkConfigurationUpdated(long nwid,
-			VirtualNetworkConfigOperation op, VirtualNetworkConfig config) {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public void onEvent(Event event) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void onNetworkError(Event event, InetSocketAddress source) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void onOutOfDate(Version newVersion) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void onTrace(String message) {
-		// TODO Auto-generated method stub
-		
-	}
-}
-- 
cgit v1.2.3


From b84dba3ecb2f750f5b5fda39544e20f741f961a4 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 3 Jun 2015 21:29:07 -0700
Subject: more logging

---
 java/jni/com_zerotierone_sdk_Node.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index f0405813..c84524fa 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -416,10 +416,15 @@ namespace {
         {
             // set operation
             jbyteArray bufferObj = env->NewByteArray(bufferSize);
+            if(env->ExceptionCheck() || bufferObj == NULL)
+            {
+                LOGE("Error creating byte array buffer!");
+                return -4;
+            }
+
             env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
             bool bsecure = secure != 0;
 
-
             return env->CallIntMethod(ref->dataStorePutListener,
                 dataStorePutCallbackMethod,
                 nameStr, bufferObj, bsecure);
@@ -736,12 +741,14 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     if(node == NULL)
     {
         // cannot find valid node.  We should  never get here.
+        LOGE("Couldn't find a valid node!");
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
 
     unsigned int nbtd_len = env->GetArrayLength(out_nextBackgroundTaskDeadline);
     if(nbtd_len < 1)
     {
+        LOGE("nbtd_len < 1");
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
 
@@ -751,6 +758,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     jclass inetAddressClass = cache.findClass("java/net/InetAddress");
     if(inetAddressClass == NULL)
     {
+        LOGE("Can't find InetAddress class");
         // can't find java.net.InetAddress
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
@@ -849,6 +857,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
         packetData,
         packetLength,
         &nextBackgroundTaskDeadline);
+    if(rc != ZT1_RESULT_OK) 
+    {
+        LOGE("ZT1_Node_processWirePacket returned: %d", rc);
+    }
 
     jlong *outDeadline = env->GetLongArrayElements(out_nextBackgroundTaskDeadline, NULL);
     outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
-- 
cgit v1.2.3


From 7cc64c5cb69f2962d32ca41f6dc12499964d22a7 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 3 Jun 2015 21:29:19 -0700
Subject: Might help to set the enabled field on a VirtualNetworkConfig object
 :)

---
 java/jni/ZT1_jniutils.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java')

diff --git a/java/jni/ZT1_jniutils.cpp b/java/jni/ZT1_jniutils.cpp
index e6404e87..36f68f9e 100644
--- a/java/jni/ZT1_jniutils.cpp
+++ b/java/jni/ZT1_jniutils.cpp
@@ -822,6 +822,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
     env->SetBooleanField(vnetConfigObj, dhcpField, vnetConfig.dhcp);
     env->SetBooleanField(vnetConfigObj, bridgeField, vnetConfig.bridge);
     env->SetBooleanField(vnetConfigObj, broadcastEnabledField, vnetConfig.broadcastEnabled);
+    env->SetBooleanField(vnetConfigObj, enabledField, vnetConfig.enabled);
     env->SetIntField(vnetConfigObj, portErrorField, vnetConfig.portError);
 
     jclass multicastGroupClass = cache.findClass("com/zerotier/sdk/MulticastGroup");
-- 
cgit v1.2.3


From ced040c5033bd61a963e65e8e8525459c4b8b59d Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 9 Jun 2015 19:38:05 -0700
Subject: Logging and adding .equals() methods to MulticastGroup and
 VirtualNetworkCofnig

---
 java/jni/ZT1_jniutils.cpp                          | 10 +++---
 java/jni/com_zerotierone_sdk_Node.cpp              | 12 ++++---
 java/src/com/zerotier/sdk/MulticastGroup.java      |  4 +++
 .../src/com/zerotier/sdk/VirtualNetworkConfig.java | 38 ++++++++++++++++++++++
 4 files changed, 54 insertions(+), 10 deletions(-)

(limited to 'java')

diff --git a/java/jni/ZT1_jniutils.cpp b/java/jni/ZT1_jniutils.cpp
index 36f68f9e..1e8a48bf 100644
--- a/java/jni/ZT1_jniutils.cpp
+++ b/java/jni/ZT1_jniutils.cpp
@@ -343,18 +343,18 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
     {
         case AF_INET6:
         {
-            LOGD("IPV6 Address");
+            LOGV("IPV6 Address");
             sockaddr_in6 *ipv6 = (sockaddr_in6*)&addr;
             port = ntohs(ipv6->sin6_port);
-            LOGD("Port %d", port);
+            LOGV("Port %d", port);
         }
         break;
         case AF_INET:
         {
-            LOGD("IPV4 Address");
+            LOGV("IPV4 Address");
             sockaddr_in *ipv4 = (sockaddr_in*)&addr;
             port = ntohs(ipv4->sin_port);
-            LOGD("Port: %d", port);
+            LOGV("Port: %d", port);
         }
         break;
         default:
@@ -818,7 +818,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
     }
     env->SetObjectField(vnetConfigObj, typeField, typeObject);
 
-    env->SetIntField(vnetConfigObj, mtuField, vnetConfig.mtu);
+    env->SetIntField(vnetConfigObj, mtuField, (int)vnetConfig.mtu);
     env->SetBooleanField(vnetConfigObj, dhcpField, vnetConfig.dhcp);
     env->SetBooleanField(vnetConfigObj, bridgeField, vnetConfig.bridge);
     env->SetBooleanField(vnetConfigObj, broadcastEnabledField, vnetConfig.broadcastEnabled);
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index c84524fa..2a90bb85 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -92,7 +92,7 @@ namespace {
         enum ZT1_VirtualNetworkConfigOperation operation,
         const ZT1_VirtualNetworkConfig *config)
     {
-        LOGD("VritualNetworkConfigFunctionCallback");
+        LOGV("VritualNetworkConfigFunctionCallback");
         JniRef *ref = (JniRef*)userData;
         JNIEnv *env = NULL;
         ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
@@ -142,7 +142,9 @@ namespace {
         const void *frameData,
         unsigned int frameLength)
     {
-        LOGD("VirtualNetworkFrameFunctionCallback");
+        LOGV("VirtualNetworkFrameFunctionCallback");
+        unsigned char* local = (unsigned char*)frameData;
+        LOGV("Type Bytes: 0x%02x%02x", local[12], local[13]);
         JniRef *ref = (JniRef*)userData;
         assert(ref->node == node);
         JNIEnv *env = NULL;
@@ -188,7 +190,7 @@ namespace {
 
     void EventCallback(ZT1_Node *node,void *userData,enum ZT1_Event event, const void *data)
     {
-        LOGD("EventCallback");
+        LOGV("EventCallback");
         JniRef *ref = (JniRef*)userData;
         assert(ref->node == node);
         JNIEnv *env = NULL;
@@ -436,7 +438,7 @@ namespace {
         const void *buffer,
         unsigned int bufferSize)
     {
-        LOGD("WirePacketSendFunction(%p, %p, %d)", address, buffer, bufferSize);
+        LOGV("WirePacketSendFunction(%p, %p, %d)", address, buffer, bufferSize);
         JniRef *ref = (JniRef*)userData;
         assert(ref->node == node);
 
@@ -464,7 +466,7 @@ namespace {
         env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
         int retval = env->CallIntMethod(ref->packetSender, packetSenderCallbackMethod, addressObj, bufferObj);
 
-        LOGD("JNI Packet Sender returned: %d", retval);
+        LOGV("JNI Packet Sender returned: %d", retval);
         return retval;
     }
 
diff --git a/java/src/com/zerotier/sdk/MulticastGroup.java b/java/src/com/zerotier/sdk/MulticastGroup.java
index 5c4df87a..68114424 100644
--- a/java/src/com/zerotier/sdk/MulticastGroup.java
+++ b/java/src/com/zerotier/sdk/MulticastGroup.java
@@ -33,6 +33,10 @@ public final class MulticastGroup {
     private long mac;
     private long adi;
 
+    public boolean equals(MulticastGroup other) {
+        return mac == other.mac && adi == other.adi;
+    }
+
     /**
      * MAC address (least significant 48 bits)
      */
diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 2be03acb..35453ddc 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -54,6 +54,44 @@ public final class VirtualNetworkConfig {
 
     }
 
+    public boolean equals(VirtualNetworkConfig cfg) {
+        boolean mcgEqual = true;
+        if(multicastSubscriptions.length == cfg.multicastSubscriptions.length) {
+            for(int i = 0; i < multicastSubscriptions.length; ++i) {
+                if(!multicastSubscriptions[i].equals(cfg.multicastSubscriptions[i]))
+                {
+                    return false;
+                }
+            }
+        } else {
+            mcgEqual = false;
+        }
+
+        boolean aaEqual = true;
+        if(assignedAddresses.length == cfg.assignedAddresses.length) {
+            for(int i = 0; i < assignedAddresses.length; ++i) {
+                if(!assignedAddresses[i].equals(cfg.assignedAddresses[i])) {
+                    return false;
+                }
+            }
+        } else {
+            aaEqual = false;
+        }
+
+        return nwid == cfg.nwid &&
+               mac == cfg.mac &&
+               name.equals(cfg.name) &&
+               status.equals(cfg.status) &&
+               type.equals(cfg.type) &&
+               mtu == cfg.mtu &&
+               dhcp == cfg.dhcp &&
+               bridge == cfg.bridge &&
+               broadcastEnabled == cfg.broadcastEnabled &&
+               portError == cfg.portError &&
+               enabled == cfg.enabled &&
+               mcgEqual && aaEqual;
+    }
+
     /**
      * 64-bit ZeroTier network ID
      */
-- 
cgit v1.2.3


From 4dc0ff8f13a2a5d852cda9302632d58b25d045ac Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 9 Jun 2015 23:12:44 -0700
Subject: Replace calls to Get<Type>ArrayElements with
 GetPrimitiveArrayCritical.

This puts code accessing the data in a critical section so that the GC cannot run while JNI has access to the array.  This helps with stability somewhat, but I'm still getting some crashes in the GC
---
 java/jni/com_zerotierone_sdk_Node.cpp | 54 +++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 25 deletions(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 2a90bb85..62fbba89 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -174,9 +174,9 @@ namespace {
             return;
         }
 
-        jbyte *data = env->GetByteArrayElements(dataArray, NULL);
+        void *data = env->GetPrimitiveArrayCritical(dataArray, NULL);
         memcpy(data, frameData, frameLength);
-        env->ReleaseByteArrayElements(dataArray, data, 0);
+        env->ReleasePrimitiveArrayCritical(dataArray, data, 0);
 
         if(env->ExceptionCheck())
         {
@@ -356,13 +356,13 @@ namespace {
 
         if(retval > 0)
         {
-            jbyte *data = env->GetByteArrayElements(bufferObj, NULL);
+            void *data = env->GetPrimitiveArrayCritical(bufferObj, NULL);
             memcpy(buffer, data, retval);
-            env->ReleaseByteArrayElements(bufferObj, data, JNI_ABORT);
+            env->ReleasePrimitiveArrayCritical(bufferObj, data, 0);
 
-            jlong *objSize = env->GetLongArrayElements(objectSizeObj, NULL);
+            jlong *objSize = (jlong*)env->GetPrimitiveArrayCritical(objectSizeObj, NULL);
             *out_objectSize = (unsigned long)objSize[0];
-            env->ReleaseLongArrayElements(objectSizeObj, objSize, JNI_ABORT);
+            env->ReleasePrimitiveArrayCritical(objectSizeObj, objSize, 0);
         }
 
         LOGI("Out Object Size: %lu", *out_objectSize);
@@ -700,7 +700,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
     unsigned int vlanId = (unsigned int)in_vlanId;
 
     unsigned int frameLength = env->GetArrayLength(in_frameData);
-    jbyte *frameData =env->GetByteArrayElements(in_frameData, NULL);
+    void *frameData = env->GetPrimitiveArrayCritical(in_frameData, NULL);
+    void *localData = malloc(frameLength);
+    memcpy(localData, frameData, frameLength);
+    env->ReleasePrimitiveArrayCritical(in_frameData, frameData, 0);
 
     uint64_t nextBackgroundTaskDeadline = 0;
 
@@ -712,15 +715,15 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
         destMac,
         etherType,
         vlanId,
-        (const void*)frameData,
+        (const void*)localData,
         frameLength,
         &nextBackgroundTaskDeadline);
 
-    jlong *outDeadline = env->GetLongArrayElements(out_nextBackgroundTaskDeadline, NULL);
-    outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
-    env->ReleaseLongArrayElements(out_nextBackgroundTaskDeadline, outDeadline, 0);
+    
 
-    env->ReleaseByteArrayElements(in_frameData, frameData, 0);
+    jlong *outDeadline = (jlong*)env->GetPrimitiveArrayCritical(out_nextBackgroundTaskDeadline, NULL);
+    outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
+    env->ReleasePrimitiveArrayCritical(out_nextBackgroundTaskDeadline, outDeadline, 0);
 
     return createResultObject(env, rc);
 }
@@ -816,8 +819,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
 
     unsigned int addrSize = env->GetArrayLength(addressArray);
     // get the address bytes
-    jbyte *addr = env->GetByteArrayElements(addressArray, NULL);
-
+    jbyte *addr = (jbyte*)env->GetPrimitiveArrayCritical(addressArray, NULL);
 
     sockaddr_storage remoteAddress = {};
 
@@ -842,13 +844,16 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     else
     {
         // unknown address type
-        env->ReleaseByteArrayElements(addressArray, addr, 0);
+        env->ReleasePrimitiveArrayCritical(addressArray, addr, 0);
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
-
+    env->ReleasePrimitiveArrayCritical(addressArray, addr, 0);
 
     unsigned int packetLength = env->GetArrayLength(in_packetData);
-    jbyte *packetData = env->GetByteArrayElements(in_packetData, NULL);
+    void *packetData = env->GetPrimitiveArrayCritical(in_packetData, NULL);
+    void *localData = malloc(packetLength);
+    memcpy(localData, packetData, packetLength);
+    env->ReleasePrimitiveArrayCritical(in_packetData, packetData, 0);
 
     uint64_t nextBackgroundTaskDeadline = 0;
 
@@ -856,7 +861,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
         node,
         now,
         &remoteAddress,
-        packetData,
+        localData,
         packetLength,
         &nextBackgroundTaskDeadline);
     if(rc != ZT1_RESULT_OK) 
@@ -864,12 +869,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
         LOGE("ZT1_Node_processWirePacket returned: %d", rc);
     }
 
-    jlong *outDeadline = env->GetLongArrayElements(out_nextBackgroundTaskDeadline, NULL);
-    outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
-    env->ReleaseLongArrayElements(out_nextBackgroundTaskDeadline, outDeadline, 0);
+    free(localData);
 
-    env->ReleaseByteArrayElements(addressArray, addr, 0);
-    env->ReleaseByteArrayElements(in_packetData, packetData, 0);
+    jlong *outDeadline = (jlong*)env->GetPrimitiveArrayCritical(out_nextBackgroundTaskDeadline, NULL);
+    outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
+    env->ReleasePrimitiveArrayCritical(out_nextBackgroundTaskDeadline, outDeadline, 0);
 
     return createResultObject(env, rc);
 }
@@ -904,9 +908,9 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processBackgroundTasks(
 
     ZT1_ResultCode rc = ZT1_Node_processBackgroundTasks(node, now, &nextBackgroundTaskDeadline);
 
-    jlong *outDeadline = env->GetLongArrayElements(out_nextBackgroundTaskDeadline, NULL);
+    jlong *outDeadline = (jlong*)env->GetPrimitiveArrayCritical(out_nextBackgroundTaskDeadline, NULL);
     outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
-    env->ReleaseLongArrayElements(out_nextBackgroundTaskDeadline, outDeadline, 0);
+    env->ReleasePrimitiveArrayCritical(out_nextBackgroundTaskDeadline, outDeadline, 0);
 
     return createResultObject(env, rc);
 }
-- 
cgit v1.2.3


From 6889fcfc28ad7df236e9883c17d73c9badb8edd5 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 9 Jun 2015 23:24:47 -0700
Subject: Looks like it was the JNI cash causing the crash.

Forcing it to look up classes and methods instead of caching them stopped the crashes in the GC.  Will investigate more later.
---
 java/jni/ZT1_jnicache.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/jni/ZT1_jnicache.cpp b/java/jni/ZT1_jnicache.cpp
index 8d6305cb..4deec61f 100644
--- a/java/jni/ZT1_jnicache.cpp
+++ b/java/jni/ZT1_jnicache.cpp
@@ -111,7 +111,7 @@ jclass JniCache::findClass(const std::string &name)
 
         jclass cls = (jclass)env->NewGlobalRef(localCls);
 
-        m_classes.insert(std::make_pair(name, cls));
+        //m_classes.insert(std::make_pair(name, cls));
 
         return cls;
     }
@@ -143,7 +143,7 @@ jmethodID JniCache::findMethod(jclass cls, const std::string &methodName, const
             return NULL;
         }
 
-        m_methods.insert(std::make_pair(id, mid));
+        //m_methods.insert(std::make_pair(id, mid));
 
         return mid;
     }
@@ -173,7 +173,7 @@ jmethodID JniCache::findStaticMethod(jclass cls, const std::string &methodName,
             return NULL;
         }
 
-        m_staticMethods.insert(std::make_pair(id, mid));
+        //m_staticMethods.insert(std::make_pair(id, mid));
 
         return mid;
     }
@@ -203,7 +203,7 @@ jfieldID JniCache::findField(jclass cls, const std::string &fieldName, const std
             return NULL;
         }
 
-        m_fields.insert(std::make_pair(id, fid));
+        //m_fields.insert(std::make_pair(id, fid));
 
         return fid;
     }
@@ -233,7 +233,7 @@ jfieldID JniCache::findStaticField(jclass cls, const std::string &fieldName, con
             return NULL;
         }
 
-        m_staticFields.insert(std::make_pair(id, fid));
+        //m_staticFields.insert(std::make_pair(id, fid));
 
         return fid;
     }
-- 
cgit v1.2.3


From 7e84f5a7dbb50913a78311df4f748455be0e1097 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 9 Jun 2015 23:24:54 -0700
Subject: killing whitespace

---
 java/jni/com_zerotierone_sdk_Node.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 62fbba89..9516db41 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -719,8 +719,6 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processVirtualNetworkFrame(
         frameLength,
         &nextBackgroundTaskDeadline);
 
-    
-
     jlong *outDeadline = (jlong*)env->GetPrimitiveArrayCritical(out_nextBackgroundTaskDeadline, NULL);
     outDeadline[0] = (jlong)nextBackgroundTaskDeadline;
     env->ReleasePrimitiveArrayCritical(out_nextBackgroundTaskDeadline, outDeadline, 0);
-- 
cgit v1.2.3


From 472206dfb23e8c2d285d5cdf19ba1444d07e4d52 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 10 Jun 2015 20:16:13 -0700
Subject: Rename JniCache to JniLookup

Removed caching capabilities as the cached methods, fields, and objects appears to be broken on Android
---
 java/CMakeLists.txt                   |   2 +-
 java/jni/Android.mk                   |   2 +-
 java/jni/ZT1_jnicache.cpp             | 242 ----------------------------------
 java/jni/ZT1_jnicache.h               |  65 ---------
 java/jni/ZT1_jnilookup.cpp            | 158 ++++++++++++++++++++++
 java/jni/ZT1_jnilookup.h              |  54 ++++++++
 java/jni/ZT1_jniutils.cpp             | 132 +++++++++----------
 java/jni/com_zerotierone_sdk_Node.cpp |  68 +++++-----
 8 files changed, 314 insertions(+), 409 deletions(-)
 delete mode 100644 java/jni/ZT1_jnicache.cpp
 delete mode 100644 java/jni/ZT1_jnicache.h
 create mode 100644 java/jni/ZT1_jnilookup.cpp
 create mode 100644 java/jni/ZT1_jnilookup.h

(limited to 'java')

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index db3eec1c..382fd3cd 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -54,7 +54,7 @@ set(src_files
     ../osdep/OSUtils.cpp
     jni/com_zerotierone_sdk_Node.cpp
     jni/ZT1_jniutils.cpp
-    jni/ZT1_jnicache.cpp
+    jni/ZT1_jnilookup.cpp
     )
 
 set(include_dirs
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index bbf14348..9986c2c3 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -39,6 +39,6 @@ LOCAL_SRC_FILES := \
 LOCAL_SRC_FILES += \
 	com_zerotierone_sdk_Node.cpp \
 	ZT1_jniutils.cpp \
-	ZT1_jnicache.cpp
+	ZT1_jnilookup.cpp
 
 include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/java/jni/ZT1_jnicache.cpp b/java/jni/ZT1_jnicache.cpp
deleted file mode 100644
index 4deec61f..00000000
--- a/java/jni/ZT1_jnicache.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-
-#include "ZT1_jnicache.h"
-#include "ZT1_jniutils.h"
-
-JniCache::JniCache()
-    : m_jvm(NULL)
-    , m_classes()
-    , m_fields()
-    , m_staticFields()
-    , m_methods()
-    , m_staticMethods()
-{
-    LOGV("JNI Cache Created");
-}
-
-JniCache::JniCache(JavaVM *jvm)
-    : m_jvm(jvm)
-    , m_classes()
-    , m_fields()
-    , m_staticFields()
-    , m_methods()
-    , m_staticMethods()
-{
-    LOGV("JNI Cache Created");
-}
-
-JniCache::~JniCache()
-{
-    LOGV("JNI Cache Destroyed");
-    clearCache();
-}
-
-void JniCache::clearCache()
-{
-    if(m_jvm)
-    {
-        JNIEnv *env = NULL;
-        if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
-            return;
-
-        for(ClassMap::iterator iter = m_classes.begin(), end = m_classes.end();
-            iter != end; ++iter)
-        {
-            env->DeleteGlobalRef(iter->second);
-        }
-    }
-
-    m_classes.clear();
-    m_fields.clear();
-    m_staticFields.clear();
-    m_methods.clear();
-    m_staticMethods.clear();
-}
-
-void JniCache::setJavaVM(JavaVM *jvm)
-{ 
-    LOGV("Assigned JVM to object");
-    m_jvm = jvm; 
-}
-
-
-jclass JniCache::findClass(const std::string &name)
-{
-    if(!m_jvm)
-        return NULL;
-
-    ClassMap::iterator found = m_classes.find(name);
-
-    if(found == m_classes.end())
-    {
-        // get the class from the JVM
-        JNIEnv *env = NULL;
-        if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
-        {
-            LOGE("Error retreiving JNI Environment");
-            return NULL;
-        }
-
-        jclass localCls = env->FindClass(name.c_str());
-        if(env->ExceptionCheck())
-        {
-            LOGE("Error finding class: %s", name.c_str());
-            return NULL;
-        }
-
-        jclass cls = (jclass)env->NewGlobalRef(localCls);
-
-        //m_classes.insert(std::make_pair(name, cls));
-
-        return cls;
-    }
-
-    LOGV("Returning cached %s", name.c_str());
-    return found->second;
-}
-
-
-jmethodID JniCache::findMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
-{
-    if(!m_jvm)
-        return NULL;
-
-    std::string id = methodName + methodSig;
-
-    MethodMap::iterator found = m_methods.find(id);
-    if(found == m_methods.end())
-    {
-        JNIEnv *env = NULL;
-        if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
-        {
-            return NULL;
-        }
-
-        jmethodID mid = env->GetMethodID(cls, methodName.c_str(), methodSig.c_str());
-        if(env->ExceptionCheck())
-        {
-            return NULL;
-        }
-
-        //m_methods.insert(std::make_pair(id, mid));
-
-        return mid;
-    }
-
-    return found->second;
-}
-
-jmethodID JniCache::findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
-{
-    if(!m_jvm)
-        return NULL;
-
-    std::string id = methodName + methodSig;
-
-    MethodMap::iterator found = m_staticMethods.find(id);
-    if(found == m_staticMethods.end())
-    {
-        JNIEnv *env = NULL;
-        if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
-        {
-            return NULL;
-        }
-
-        jmethodID mid = env->GetStaticMethodID(cls, methodName.c_str(), methodSig.c_str());
-        if(env->ExceptionCheck())
-        {
-            return NULL;
-        }
-
-        //m_staticMethods.insert(std::make_pair(id, mid));
-
-        return mid;
-    }
-
-    return found->second;
-}
-
-jfieldID JniCache::findField(jclass cls, const std::string &fieldName, const std::string &typeStr)
-{
-    if(!m_jvm)
-        return NULL;
-
-    std::string id = fieldName + typeStr;
-
-    FieldMap::iterator found = m_fields.find(id);
-    if(found == m_fields.end())
-    {
-        JNIEnv *env = NULL;
-        if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
-        {
-            return NULL;
-        }
-
-        jfieldID fid = env->GetFieldID(cls, fieldName.c_str(), typeStr.c_str());
-        if(env->ExceptionCheck())
-        {
-            return NULL;
-        }
-
-        //m_fields.insert(std::make_pair(id, fid));
-
-        return fid;
-    }
-
-    return found->second;
-}
-
-jfieldID JniCache::findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr)
-{
-    if(!m_jvm)
-        return NULL;
-
-    std::string id = fieldName + typeStr;
-
-    FieldMap::iterator found = m_staticFields.find(id);
-    if(found == m_staticFields.end())
-    {
-        JNIEnv *env = NULL;
-        if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
-        {
-            return NULL;
-        }
-
-        jfieldID fid = env->GetStaticFieldID(cls, fieldName.c_str(), typeStr.c_str());
-        if(env->ExceptionCheck())
-        {
-            return NULL;
-        }
-
-        //m_staticFields.insert(std::make_pair(id, fid));
-
-        return fid;
-    }
-
-    return found->second;
-}
\ No newline at end of file
diff --git a/java/jni/ZT1_jnicache.h b/java/jni/ZT1_jnicache.h
deleted file mode 100644
index 43f43a08..00000000
--- a/java/jni/ZT1_jnicache.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * ZeroTier One - Network Virtualization Everywhere
- * Copyright (C) 2011-2015  ZeroTier, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * --
- *
- * ZeroTier may be used and distributed under the terms of the GPLv3, which
- * are available at: http://www.gnu.org/licenses/gpl-3.0.html
- *
- * If you would like to embed ZeroTier into a commercial application or
- * redistribute it in a modified binary form, please contact ZeroTier Networks
- * LLC. Start here: http://www.zerotier.com/
- */
-
-#ifndef ZT1_JNICACHE_H_
-#define ZT1_JNICACHE_H_
-
-#include <jni.h>
-#include <map>
-#include <string>
-
-
-
-class JniCache {
-public:
-    JniCache();
-    JniCache(JavaVM *jvm);
-    ~JniCache();
-
-    void setJavaVM(JavaVM *jvm);
-    void clearCache();
-
-    jclass findClass(const std::string &name);
-    jmethodID findMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
-    jmethodID findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
-    jfieldID findField(jclass cls, const std::string &fieldName, const std::string &typeStr);
-    jfieldID findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr);
-private:
-    typedef std::map<std::string, jmethodID> MethodMap;
-    typedef std::map<std::string, jfieldID> FieldMap;
-    typedef std::map<std::string, jclass> ClassMap;
-
-    JavaVM *m_jvm;
-    ClassMap m_classes;
-    FieldMap m_fields;
-    FieldMap m_staticFields;
-    MethodMap m_methods;
-    MethodMap m_staticMethods;
-
-};
-
-#endif
\ No newline at end of file
diff --git a/java/jni/ZT1_jnilookup.cpp b/java/jni/ZT1_jnilookup.cpp
new file mode 100644
index 00000000..d8f5cc7f
--- /dev/null
+++ b/java/jni/ZT1_jnilookup.cpp
@@ -0,0 +1,158 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#include "ZT1_jnilookup.h"
+#include "ZT1_jniutils.h"
+
+JniLookup::JniLookup()
+    : m_jvm(NULL)
+{
+    LOGV("JNI Cache Created");
+}
+
+JniLookup::JniLookup(JavaVM *jvm)
+    : m_jvm(jvm)
+{
+    LOGV("JNI Cache Created");
+}
+
+JniLookup::~JniLookup()
+{
+    LOGV("JNI Cache Destroyed");
+}
+
+
+void JniLookup::setJavaVM(JavaVM *jvm)
+{ 
+    LOGV("Assigned JVM to object");
+    m_jvm = jvm; 
+}
+
+
+jclass JniLookup::findClass(const std::string &name)
+{
+    if(!m_jvm)
+        return NULL;
+
+    // get the class from the JVM
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        LOGE("Error retreiving JNI Environment");
+        return NULL;
+    }
+
+    jclass cls = env->FindClass(name.c_str());
+    if(env->ExceptionCheck())
+    {
+        LOGE("Error finding class: %s", name.c_str());
+        return NULL;
+    }
+
+    return cls;
+}
+
+
+jmethodID JniLookup::findMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jmethodID mid = env->GetMethodID(cls, methodName.c_str(), methodSig.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return mid;
+}
+
+jmethodID JniLookup::findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jmethodID mid = env->GetStaticMethodID(cls, methodName.c_str(), methodSig.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return mid;
+}
+
+jfieldID JniLookup::findField(jclass cls, const std::string &fieldName, const std::string &typeStr)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jfieldID fid = env->GetFieldID(cls, fieldName.c_str(), typeStr.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return fid;
+}
+
+jfieldID JniLookup::findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr)
+{
+    if(!m_jvm)
+        return NULL;
+
+    JNIEnv *env = NULL;
+    if(m_jvm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK)
+    {
+        return NULL;
+    }
+
+    jfieldID fid = env->GetStaticFieldID(cls, fieldName.c_str(), typeStr.c_str());
+    if(env->ExceptionCheck())
+    {
+        return NULL;
+    }
+
+    return fid;
+}
\ No newline at end of file
diff --git a/java/jni/ZT1_jnilookup.h b/java/jni/ZT1_jnilookup.h
new file mode 100644
index 00000000..cf496f88
--- /dev/null
+++ b/java/jni/ZT1_jnilookup.h
@@ -0,0 +1,54 @@
+/*
+ * ZeroTier One - Network Virtualization Everywhere
+ * Copyright (C) 2011-2015  ZeroTier, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * --
+ *
+ * ZeroTier may be used and distributed under the terms of the GPLv3, which
+ * are available at: http://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * If you would like to embed ZeroTier into a commercial application or
+ * redistribute it in a modified binary form, please contact ZeroTier Networks
+ * LLC. Start here: http://www.zerotier.com/
+ */
+
+#ifndef ZT1_JNILOOKUP_H_
+#define ZT1_JNILOOKUP_H_
+
+#include <jni.h>
+#include <map>
+#include <string>
+
+
+
+class JniLookup {
+public:
+    JniLookup();
+    JniLookup(JavaVM *jvm);
+    ~JniLookup();
+
+    void setJavaVM(JavaVM *jvm);
+
+    jclass findClass(const std::string &name);
+    jmethodID findMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
+    jmethodID findStaticMethod(jclass cls, const std::string &methodName, const std::string &methodSig);
+    jfieldID findField(jclass cls, const std::string &fieldName, const std::string &typeStr);
+    jfieldID findStaticField(jclass cls, const std::string &fieldName, const std::string &typeStr);
+private:
+    JavaVM *m_jvm;
+};
+
+#endif
\ No newline at end of file
diff --git a/java/jni/ZT1_jniutils.cpp b/java/jni/ZT1_jniutils.cpp
index 1e8a48bf..ac04eb58 100644
--- a/java/jni/ZT1_jniutils.cpp
+++ b/java/jni/ZT1_jniutils.cpp
@@ -1,9 +1,9 @@
 #include "ZT1_jniutils.h"
-#include "ZT1_jnicache.h"
+#include "ZT1_jnilookup.h"
 #include <string>
 #include <assert.h>
 
-extern JniCache cache;
+extern JniLookup lookup;
 
 #ifdef __cplusplus
 extern "C" {
@@ -15,7 +15,7 @@ jobject createResultObject(JNIEnv *env, ZT1_ResultCode code)
     
     jobject resultObject = NULL;
 
-    resultClass = cache.findClass("com/zerotier/sdk/ResultCode");
+    resultClass = lookup.findClass("com/zerotier/sdk/ResultCode");
     if(resultClass == NULL)
     {
         LOGE("Couldnt find ResultCode class");
@@ -48,7 +48,7 @@ jobject createResultObject(JNIEnv *env, ZT1_ResultCode code)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(resultClass, fieldName.c_str(), "Lcom/zerotier/sdk/ResultCode;");
+    jfieldID enumField = lookup.findStaticField(resultClass, fieldName.c_str(), "Lcom/zerotier/sdk/ResultCode;");
     if(env->ExceptionCheck() || enumField == NULL) 
     {
         LOGE("Error on FindStaticField");
@@ -68,7 +68,7 @@ jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status)
 {
     jobject statusObject = NULL;
 
-    jclass statusClass = cache.findClass("com/zerotier/sdk/VirtualNetworkStatus");
+    jclass statusClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkStatus");
     if(statusClass == NULL)
     {
         return NULL; // exception thrown
@@ -97,7 +97,7 @@ jobject createVirtualNetworkStatus(JNIEnv *env, ZT1_VirtualNetworkStatus status)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(statusClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkStatus;");
+    jfieldID enumField = lookup.findStaticField(statusClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkStatus;");
 
     statusObject = env->GetStaticObjectField(statusClass, enumField);
 
@@ -109,7 +109,7 @@ jobject createEvent(JNIEnv *env, ZT1_Event event)
     jclass eventClass = NULL;
     jobject eventObject = NULL;
 
-    eventClass = cache.findClass("com/zerotier/sdk/Event");
+    eventClass = lookup.findClass("com/zerotier/sdk/Event");
     if(eventClass == NULL)
     {
         return NULL;
@@ -147,7 +147,7 @@ jobject createEvent(JNIEnv *env, ZT1_Event event)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(eventClass, fieldName.c_str(), "Lcom/zerotier/sdk/Event;");
+    jfieldID enumField = lookup.findStaticField(eventClass, fieldName.c_str(), "Lcom/zerotier/sdk/Event;");
 
     eventObject = env->GetStaticObjectField(eventClass, enumField);
 
@@ -159,7 +159,7 @@ jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
     jclass peerRoleClass = NULL;
     jobject peerRoleObject = NULL;
 
-    peerRoleClass = cache.findClass("com/zerotier/sdk/PeerRole");
+    peerRoleClass = lookup.findClass("com/zerotier/sdk/PeerRole");
     if(peerRoleClass == NULL)
     {
         return NULL;
@@ -179,7 +179,7 @@ jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(peerRoleClass, fieldName.c_str(), "Lcom/zerotier/sdk/PeerRole;");
+    jfieldID enumField = lookup.findStaticField(peerRoleClass, fieldName.c_str(), "Lcom/zerotier/sdk/PeerRole;");
 
     peerRoleObject = env->GetStaticObjectField(peerRoleClass, enumField);
 
@@ -191,7 +191,7 @@ jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type)
     jclass vntypeClass = NULL;
     jobject vntypeObject = NULL;
 
-    vntypeClass = cache.findClass("com/zerotier/sdk/VirtualNetworkType");
+    vntypeClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkType");
     if(env->ExceptionCheck() || vntypeClass == NULL)
     {
         return NULL;
@@ -208,7 +208,7 @@ jobject createVirtualNetworkType(JNIEnv *env, ZT1_VirtualNetworkType type)
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(vntypeClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkType;");
+    jfieldID enumField = lookup.findStaticField(vntypeClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkType;");
     vntypeObject = env->GetStaticObjectField(vntypeClass, enumField);
     return vntypeObject;
 }
@@ -218,7 +218,7 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfi
     jclass vnetConfigOpClass = NULL;
     jobject vnetConfigOpObject = NULL;
 
-    vnetConfigOpClass = cache.findClass("com/zerotier/sdk/VirtualNetworkConfigOperation");
+    vnetConfigOpClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfigOperation");
     if(env->ExceptionCheck() || vnetConfigOpClass == NULL)
     {
         return NULL;
@@ -241,7 +241,7 @@ jobject createVirtualNetworkConfigOperation(JNIEnv *env, ZT1_VirtualNetworkConfi
         break;
     }
 
-    jfieldID enumField = cache.findStaticField(vnetConfigOpClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkConfigOperation;");
+    jfieldID enumField = lookup.findStaticField(vnetConfigOpClass, fieldName.c_str(), "Lcom/zerotier/sdk/VirtualNetworkConfigOperation;");
     vnetConfigOpObject = env->GetStaticObjectField(vnetConfigOpClass, enumField);
     return vnetConfigOpObject;
 }
@@ -252,14 +252,14 @@ jobject newInetAddress(JNIEnv *env, const sockaddr_storage &addr)
     jclass inetAddressClass = NULL;
     jmethodID inetAddress_getByAddress = NULL;
 
-    inetAddressClass = cache.findClass("java/net/InetAddress");
+    inetAddressClass = lookup.findClass("java/net/InetAddress");
     if(env->ExceptionCheck() || inetAddressClass == NULL)
     {
         LOGE("Error finding InetAddress class");
         return NULL;
     }
 
-    inetAddress_getByAddress = cache.findStaticMethod(
+    inetAddress_getByAddress = lookup.findStaticMethod(
         inetAddressClass, "getByAddress", "([B)Ljava/net/InetAddress;");
     if(env->ExceptionCheck() || inetAddress_getByAddress == NULL)
     {
@@ -315,7 +315,7 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
     jclass inetSocketAddressClass = NULL;
     jmethodID inetSocketAddress_constructor = NULL;
 
-    inetSocketAddressClass = cache.findClass("java/net/InetSocketAddress");
+    inetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
     if(env->ExceptionCheck() || inetSocketAddressClass == NULL)
     {
         LOGE("Error finding InetSocketAddress Class");
@@ -330,7 +330,7 @@ jobject newInetSocketAddress(JNIEnv *env, const sockaddr_storage &addr)
         return NULL;
     }
 
-    inetSocketAddress_constructor = cache.findMethod(
+    inetSocketAddress_constructor = lookup.findMethod(
         inetSocketAddressClass, "<init>", "(Ljava/net/InetAddress;I)V");
     if(env->ExceptionCheck() || inetSocketAddress_constructor == NULL)
     {
@@ -380,13 +380,13 @@ jobject newMulticastGroup(JNIEnv *env, const ZT1_MulticastGroup &mc)
     jfieldID macField = NULL;
     jfieldID adiField = NULL;
 
-    multicastGroupClass = cache.findClass("com/zerotier/sdk/MulticastGroup");
+    multicastGroupClass = lookup.findClass("com/zerotier/sdk/MulticastGroup");
     if(env->ExceptionCheck() || multicastGroupClass == NULL)
     {
         return NULL;
     }
 
-    multicastGroup_constructor = cache.findMethod(
+    multicastGroup_constructor = lookup.findMethod(
         multicastGroupClass, "<init>", "()V");
     if(env->ExceptionCheck() || multicastGroup_constructor == NULL)
     {
@@ -399,13 +399,13 @@ jobject newMulticastGroup(JNIEnv *env, const ZT1_MulticastGroup &mc)
         return NULL;
     }
 
-    macField = cache.findField(multicastGroupClass, "mac", "J");
+    macField = lookup.findField(multicastGroupClass, "mac", "J");
     if(env->ExceptionCheck() || macField == NULL)
     {
         return NULL;
     }
 
-    adiField = cache.findField(multicastGroupClass, "adi", "J");
+    adiField = lookup.findField(multicastGroupClass, "adi", "J");
     if(env->ExceptionCheck() || adiField == NULL)
     {
         return NULL;
@@ -431,56 +431,56 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT1_PeerPhysicalPath &ppp)
 
     jmethodID ppp_constructor = NULL;
 
-    pppClass = cache.findClass("com/zerotier/sdk/PeerPhysicalPath");
+    pppClass = lookup.findClass("com/zerotier/sdk/PeerPhysicalPath");
     if(env->ExceptionCheck() || pppClass == NULL)
     {
         LOGE("Error finding PeerPhysicalPath class");
         return NULL;
     }
 
-    addressField = cache.findField(pppClass, "address", "Ljava/net/InetSocketAddress;");
+    addressField = lookup.findField(pppClass, "address", "Ljava/net/InetSocketAddress;");
     if(env->ExceptionCheck() || addressField == NULL)
     {
         LOGE("Error finding address field");
         return NULL;
     }
 
-    lastSendField = cache.findField(pppClass, "lastSend", "J");
+    lastSendField = lookup.findField(pppClass, "lastSend", "J");
     if(env->ExceptionCheck() || lastSendField == NULL)
     {
         LOGE("Error finding lastSend field");
         return NULL;
     }
 
-    lastReceiveField = cache.findField(pppClass, "lastReceive", "J");
+    lastReceiveField = lookup.findField(pppClass, "lastReceive", "J");
     if(env->ExceptionCheck() || lastReceiveField == NULL)
     {
         LOGE("Error finding lastReceive field");
         return NULL;
     }
 
-    fixedField = cache.findField(pppClass, "fixed", "Z");
+    fixedField = lookup.findField(pppClass, "fixed", "Z");
     if(env->ExceptionCheck() || fixedField == NULL)
     {
         LOGE("Error finding fixed field");
         return NULL;
     }
 
-    activeField = cache.findField(pppClass, "active", "Z");
+    activeField = lookup.findField(pppClass, "active", "Z");
     if(env->ExceptionCheck() || activeField == NULL)
     {
         LOGE("Error finding active field");
         return NULL;
     }
 
-    preferredField = cache.findField(pppClass, "preferred", "Z");
+    preferredField = lookup.findField(pppClass, "preferred", "Z");
     if(env->ExceptionCheck() || preferredField == NULL)
     {
         LOGE("Error finding preferred field");
         return NULL;
     }
 
-    ppp_constructor = cache.findMethod(pppClass, "<init>", "()V");
+    ppp_constructor = lookup.findMethod(pppClass, "<init>", "()V");
     if(env->ExceptionCheck() || ppp_constructor == NULL)
     {
         LOGE("Error finding PeerPhysicalPath constructor");
@@ -532,77 +532,77 @@ jobject newPeer(JNIEnv *env, const ZT1_Peer &peer)
 
     jmethodID peer_constructor = NULL;
 
-    peerClass = cache.findClass("com/zerotier/sdk/Peer");
+    peerClass = lookup.findClass("com/zerotier/sdk/Peer");
     if(env->ExceptionCheck() || peerClass == NULL)
     {
         LOGE("Error finding Peer class");
         return NULL;
     }
 
-    addressField = cache.findField(peerClass, "address", "J");
+    addressField = lookup.findField(peerClass, "address", "J");
     if(env->ExceptionCheck() || addressField == NULL)
     {
         LOGE("Error finding address field of Peer object");
         return NULL;
     }
 
-    lastUnicastFrameField = cache.findField(peerClass, "lastUnicastFrame", "J");
+    lastUnicastFrameField = lookup.findField(peerClass, "lastUnicastFrame", "J");
     if(env->ExceptionCheck() || lastUnicastFrameField == NULL)
     {
         LOGE("Error finding lastUnicastFrame field of Peer object");
         return NULL;
     }
 
-    lastMulticastFrameField = cache.findField(peerClass, "lastMulticastFrame", "J");
+    lastMulticastFrameField = lookup.findField(peerClass, "lastMulticastFrame", "J");
     if(env->ExceptionCheck() || lastMulticastFrameField == NULL)
     {
         LOGE("Error finding lastMulticastFrame field of Peer object");
         return NULL;
     }
 
-    versionMajorField = cache.findField(peerClass, "versionMajor", "I");
+    versionMajorField = lookup.findField(peerClass, "versionMajor", "I");
     if(env->ExceptionCheck() || versionMajorField == NULL)
     {
         LOGE("Error finding versionMajor field of Peer object");
         return NULL;
     }
 
-    versionMinorField = cache.findField(peerClass, "versionMinor", "I");
+    versionMinorField = lookup.findField(peerClass, "versionMinor", "I");
     if(env->ExceptionCheck() || versionMinorField == NULL)
     {
         LOGE("Error finding versionMinor field of Peer object");
         return NULL;
     }
 
-    versionRevField = cache.findField(peerClass, "versionRev", "I");
+    versionRevField = lookup.findField(peerClass, "versionRev", "I");
     if(env->ExceptionCheck() || versionRevField == NULL)
     {
         LOGE("Error finding versionRev field of Peer object");
         return NULL;
     }
 
-    latencyField = cache.findField(peerClass, "latency", "I");
+    latencyField = lookup.findField(peerClass, "latency", "I");
     if(env->ExceptionCheck() || latencyField == NULL)
     {
         LOGE("Error finding latency field of Peer object");
         return NULL;
     }
 
-    roleField = cache.findField(peerClass, "role", "Lcom/zerotier/sdk/PeerRole;");
+    roleField = lookup.findField(peerClass, "role", "Lcom/zerotier/sdk/PeerRole;");
     if(env->ExceptionCheck() || roleField == NULL)
     {
         LOGE("Error finding role field of Peer object");
         return NULL;
     }
 
-    pathsField = cache.findField(peerClass, "paths", "[Lcom/zerotier/sdk/PeerPhysicalPath;");
+    pathsField = lookup.findField(peerClass, "paths", "[Lcom/zerotier/sdk/PeerPhysicalPath;");
     if(env->ExceptionCheck() || pathsField == NULL)
     {
         LOGE("Error finding paths field of Peer object");
         return NULL;
     }
 
-    peer_constructor = cache.findMethod(peerClass, "<init>", "()V");
+    peer_constructor = lookup.findMethod(peerClass, "<init>", "()V");
     if(env->ExceptionCheck() || peer_constructor == NULL)
     {
         LOGE("Error finding Peer constructor");
@@ -625,7 +625,7 @@ jobject newPeer(JNIEnv *env, const ZT1_Peer &peer)
     env->SetIntField(peerObject, latencyField, peer.latency);
     env->SetObjectField(peerObject, roleField, createPeerRole(env, peer.role));
 
-    jclass peerPhysicalPathClass = cache.findClass("com/zerotier/sdk/PeerPhysicalPath");
+    jclass peerPhysicalPathClass = lookup.findClass("com/zerotier/sdk/PeerPhysicalPath");
     if(env->ExceptionCheck() || peerPhysicalPathClass == NULL)
     {
         LOGE("Error finding PeerPhysicalPath class");
@@ -675,14 +675,14 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
     jfieldID multicastSubscriptionsField = NULL;
     jfieldID assignedAddressesField = NULL;
 
-    vnetConfigClass = cache.findClass("com/zerotier/sdk/VirtualNetworkConfig");
+    vnetConfigClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfig");
     if(vnetConfigClass == NULL)
     {
         LOGE("Couldn't find com.zerotier.sdk.VirtualNetworkConfig");
         return NULL;
     }
 
-    vnetConfig_constructor = cache.findMethod(
+    vnetConfig_constructor = lookup.findMethod(
         vnetConfigClass, "<init>", "()V");
     if(env->ExceptionCheck() || vnetConfig_constructor == NULL)
     {
@@ -697,98 +697,98 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
         return NULL;
     }
 
-    nwidField = cache.findField(vnetConfigClass, "nwid", "J");
+    nwidField = lookup.findField(vnetConfigClass, "nwid", "J");
     if(env->ExceptionCheck() || nwidField == NULL)
     {
         LOGE("Error getting nwid field");
         return NULL;
     }
 
-    macField = cache.findField(vnetConfigClass, "mac", "J");
+    macField = lookup.findField(vnetConfigClass, "mac", "J");
     if(env->ExceptionCheck() || macField == NULL)
     {
         LOGE("Error getting mac field");
         return NULL;
     }
 
-    nameField = cache.findField(vnetConfigClass, "name", "Ljava/lang/String;");
+    nameField = lookup.findField(vnetConfigClass, "name", "Ljava/lang/String;");
     if(env->ExceptionCheck() || nameField == NULL)
     {
         LOGE("Error getting name field");
         return NULL;
     }
 
-    statusField = cache.findField(vnetConfigClass, "status", "Lcom/zerotier/sdk/VirtualNetworkStatus;");
+    statusField = lookup.findField(vnetConfigClass, "status", "Lcom/zerotier/sdk/VirtualNetworkStatus;");
     if(env->ExceptionCheck() || statusField == NULL)
     {
         LOGE("Error getting status field");
         return NULL;
     }
 
-    typeField = cache.findField(vnetConfigClass, "type", "Lcom/zerotier/sdk/VirtualNetworkType;");
+    typeField = lookup.findField(vnetConfigClass, "type", "Lcom/zerotier/sdk/VirtualNetworkType;");
     if(env->ExceptionCheck() || typeField == NULL)
     {
         LOGE("Error getting type field");
         return NULL;
     }
 
-    mtuField = cache.findField(vnetConfigClass, "mtu", "I");
+    mtuField = lookup.findField(vnetConfigClass, "mtu", "I");
     if(env->ExceptionCheck() || mtuField == NULL)
     {
         LOGE("Error getting mtu field");
         return NULL;
     }
 
-    dhcpField = cache.findField(vnetConfigClass, "dhcp", "Z");
+    dhcpField = lookup.findField(vnetConfigClass, "dhcp", "Z");
     if(env->ExceptionCheck() || dhcpField == NULL)
     {
         LOGE("Error getting dhcp field");
         return NULL;
     }
 
-    bridgeField = cache.findField(vnetConfigClass, "bridge", "Z");
+    bridgeField = lookup.findField(vnetConfigClass, "bridge", "Z");
     if(env->ExceptionCheck() || bridgeField == NULL)
     {
         LOGE("Error getting bridge field");
         return NULL;
     }
 
-    broadcastEnabledField = cache.findField(vnetConfigClass, "broadcastEnabled", "Z");
+    broadcastEnabledField = lookup.findField(vnetConfigClass, "broadcastEnabled", "Z");
     if(env->ExceptionCheck() || broadcastEnabledField == NULL)
     {
         LOGE("Error getting broadcastEnabled field");
         return NULL;
     }
 
-    portErrorField = cache.findField(vnetConfigClass, "portError", "I");
+    portErrorField = lookup.findField(vnetConfigClass, "portError", "I");
     if(env->ExceptionCheck() || portErrorField == NULL)
     {
         LOGE("Error getting portError field");
         return NULL;
     }
 
-    enabledField = cache.findField(vnetConfigClass, "enabled", "Z");
+    enabledField = lookup.findField(vnetConfigClass, "enabled", "Z");
     if(env->ExceptionCheck() || enabledField == NULL)
     {
         LOGE("Error getting enabled field");
         return NULL;
     }
 
-    netconfRevisionField = cache.findField(vnetConfigClass, "netconfRevision", "J");
+    netconfRevisionField = lookup.findField(vnetConfigClass, "netconfRevision", "J");
     if(env->ExceptionCheck() || netconfRevisionField == NULL)
     {
         LOGE("Error getting netconfRevision field");
         return NULL;
     }
 
-    multicastSubscriptionsField = cache.findField(vnetConfigClass, "multicastSubscriptions", "[Lcom/zerotier/sdk/MulticastGroup;");
+    multicastSubscriptionsField = lookup.findField(vnetConfigClass, "multicastSubscriptions", "[Lcom/zerotier/sdk/MulticastGroup;");
     if(env->ExceptionCheck() || multicastSubscriptionsField == NULL)
     {
         LOGE("Error getting multicastSubscriptions field");
         return NULL;
     }
 
-    assignedAddressesField = cache.findField(vnetConfigClass, "assignedAddresses", "[Ljava/net/InetSocketAddress;");
+    assignedAddressesField = lookup.findField(vnetConfigClass, "assignedAddresses", "[Ljava/net/InetSocketAddress;");
     if(env->ExceptionCheck() || assignedAddressesField == NULL)
     {
         LOGE("Error getting assignedAddresses field");
@@ -825,7 +825,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
     env->SetBooleanField(vnetConfigObj, enabledField, vnetConfig.enabled);
     env->SetIntField(vnetConfigObj, portErrorField, vnetConfig.portError);
 
-    jclass multicastGroupClass = cache.findClass("com/zerotier/sdk/MulticastGroup");
+    jclass multicastGroupClass = lookup.findClass("com/zerotier/sdk/MulticastGroup");
     if(env->ExceptionCheck() || multicastGroupClass == NULL) 
     {
         LOGE("Error finding MulticastGroup class");
@@ -850,7 +850,7 @@ jobject newNetworkConfig(JNIEnv *env, const ZT1_VirtualNetworkConfig &vnetConfig
     }
     env->SetObjectField(vnetConfigObj, multicastSubscriptionsField, mcastSubsArrayObj);
 
-    jclass inetSocketAddressClass = cache.findClass("java/net/InetSocketAddress");
+    jclass inetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
     if(env->ExceptionCheck() || inetSocketAddressClass == NULL)
     {
         LOGE("Error finding InetSocketAddress class");
@@ -887,13 +887,13 @@ jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags
     jclass versionClass = NULL;
     jmethodID versionConstructor = NULL;
 
-    versionClass = cache.findClass("com/zerotier/sdk/Version");
+    versionClass = lookup.findClass("com/zerotier/sdk/Version");
     if(env->ExceptionCheck() || versionClass == NULL)
     {
         return NULL;
     }
 
-    versionConstructor = cache.findMethod(
+    versionConstructor = lookup.findMethod(
         versionClass, "<init>", "()V");
     if(env->ExceptionCheck() || versionConstructor == NULL)
     {
@@ -912,25 +912,25 @@ jobject newVersion(JNIEnv *env, int major, int minor, int rev, long featureFlags
     jfieldID revisionField = NULL;
     jfieldID featureFlagsField = NULL;
 
-    majorField = cache.findField(versionClass, "major", "I");
+    majorField = lookup.findField(versionClass, "major", "I");
     if(env->ExceptionCheck() || majorField == NULL)
     {
         return NULL;
     }
 
-    minorField = cache.findField(versionClass, "minor", "I");
+    minorField = lookup.findField(versionClass, "minor", "I");
     if(env->ExceptionCheck() || minorField == NULL)
     {
         return NULL;
     }
 
-    revisionField = cache.findField(versionClass, "revision", "I");
+    revisionField = lookup.findField(versionClass, "revision", "I");
     if(env->ExceptionCheck() || revisionField == NULL)
     {
         return NULL;
     }
 
-    featureFlagsField = cache.findField(versionClass, "featureFlags", "J");
+    featureFlagsField = lookup.findField(versionClass, "featureFlags", "J");
     if(env->ExceptionCheck() || featureFlagsField == NULL)
     {
         return NULL;
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 9516db41..aa42c548 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -27,7 +27,7 @@
 
 #include "com_zerotierone_sdk_Node.h"
 #include "ZT1_jniutils.h"
-#include "ZT1_jnicache.h"
+#include "ZT1_jnilookup.h"
 
 #include <ZeroTierOne.h>
 
@@ -36,8 +36,8 @@
 #include <assert.h>
 #include <string.h>
 
-// global static JNI Cache Object
-JniCache cache;
+// global static JNI Lookup Object
+JniLookup lookup;
 
 #ifdef __cplusplus
 extern "C" {
@@ -104,7 +104,7 @@ namespace {
             return -1;
         }
 
-        jmethodID configListenerCallbackMethod = cache.findMethod(configListenerClass,
+        jmethodID configListenerCallbackMethod = lookup.findMethod(configListenerClass,
             "onNetworkConfigurationUpdated",
             "(JLcom/zerotier/sdk/VirtualNetworkConfigOperation;Lcom/zerotier/sdk/VirtualNetworkConfig;)I");
         if(configListenerCallbackMethod == NULL)
@@ -158,7 +158,7 @@ namespace {
             return;
         }
 
-        jmethodID frameListenerCallbackMethod = cache.findMethod(
+        jmethodID frameListenerCallbackMethod = lookup.findMethod(
             frameListenerClass,
             "onVirtualNetworkFrame", "(JJJJJ[B)V");
         if(env->ExceptionCheck() || frameListenerCallbackMethod == NULL)
@@ -204,7 +204,7 @@ namespace {
             return;
         }
 
-        jmethodID onEventMethod = cache.findMethod(eventListenerClass,
+        jmethodID onEventMethod = lookup.findMethod(eventListenerClass,
             "onEvent", "(Lcom/zerotier/sdk/Event;)V");
         if(onEventMethod == NULL)
         {
@@ -213,7 +213,7 @@ namespace {
         }
 
 
-        jmethodID onOutOfDateMethod = cache.findMethod(eventListenerClass,
+        jmethodID onOutOfDateMethod = lookup.findMethod(eventListenerClass,
             "onOutOfDate", "(Lcom/zerotier/sdk/Version;)V");
         if(onOutOfDateMethod == NULL)
         {
@@ -222,7 +222,7 @@ namespace {
         }
 
 
-        jmethodID onNetworkErrorMethod = cache.findMethod(eventListenerClass,
+        jmethodID onNetworkErrorMethod = lookup.findMethod(eventListenerClass,
             "onNetworkError", "(Lcom/zerotier/sdk/Event;Ljava/net/InetSocketAddress;)V");
         if(onNetworkErrorMethod == NULL)
         {
@@ -231,7 +231,7 @@ namespace {
         }
 
 
-        jmethodID onTraceMethod = cache.findMethod(eventListenerClass,
+        jmethodID onTraceMethod = lookup.findMethod(eventListenerClass,
             "onTrace", "(Ljava/lang/String;)V");
         if(onTraceMethod == NULL)
         {
@@ -316,7 +316,7 @@ namespace {
             return -2;
         }
 
-        jmethodID dataStoreGetCallbackMethod = cache.findMethod(
+        jmethodID dataStoreGetCallbackMethod = lookup.findMethod(
             dataStoreGetClass,
             "onDataStoreGet",
             "(Ljava/lang/String;[BJ[J)J");
@@ -388,7 +388,7 @@ namespace {
             return -1;
         }
 
-        jmethodID dataStorePutCallbackMethod = cache.findMethod(
+        jmethodID dataStorePutCallbackMethod = lookup.findMethod(
             dataStorePutClass,
             "onDataStorePut",
             "(Ljava/lang/String;[BZ)I");
@@ -398,7 +398,7 @@ namespace {
             return -2;
         }
 
-        jmethodID deleteMethod = cache.findMethod(dataStorePutClass,
+        jmethodID deleteMethod = lookup.findMethod(dataStorePutClass,
             "onDelete", "(Ljava/lang/String;)I");
         if(deleteMethod == NULL)
         {
@@ -453,7 +453,7 @@ namespace {
             return -1;
         }
 
-        jmethodID packetSenderCallbackMethod = cache.findMethod(packetSenderClass,
+        jmethodID packetSenderCallbackMethod = lookup.findMethod(packetSenderClass,
             "onSendPacketRequested", "(Ljava/net/InetSocketAddress;[B)I");
         if(packetSenderCallbackMethod == NULL)
         {
@@ -487,13 +487,13 @@ namespace {
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) 
 {
-    cache.setJavaVM(vm);
+    lookup.setJavaVM(vm);
     return JNI_VERSION_1_6;
 }
 
 JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *vm, void *reserved)
 {
-    cache.clearCache();
+
 }
 
 
@@ -514,7 +514,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     env->GetJavaVM(&ref->jvm);
 
     jclass cls = env->GetObjectClass(obj);
-    jfieldID fid = cache.findField(
+    jfieldID fid = lookup.findField(
         cls, "getListener", "Lcom/zerotier/sdk/DataStoreGetListener;");
 
     if(fid == NULL)
@@ -529,7 +529,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     }
     ref->dataStoreGetListener = env->NewGlobalRef(tmp);
 
-    fid = cache.findField(
+    fid = lookup.findField(
         cls, "putListener", "Lcom/zerotier/sdk/DataStorePutListener;");
 
     if(fid == NULL)
@@ -544,7 +544,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     }
     ref->dataStorePutListener = env->NewGlobalRef(tmp);
 
-    fid = cache.findField(
+    fid = lookup.findField(
         cls, "sender", "Lcom/zerotier/sdk/PacketSender;");
     if(fid == NULL)
     {
@@ -558,7 +558,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     }
     ref->packetSender = env->NewGlobalRef(tmp);
 
-    fid = cache.findField(
+    fid = lookup.findField(
         cls, "frameListener", "Lcom/zerotier/sdk/VirtualNetworkFrameListener;");
     if(fid == NULL)
     {
@@ -572,7 +572,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     }
     ref->frameListener = env->NewGlobalRef(tmp);
 
-    fid = cache.findField(
+    fid = lookup.findField(
         cls, "configListener", "Lcom/zerotier/sdk/VirtualNetworkConfigListener;");
     if(fid == NULL)
     {
@@ -586,7 +586,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
     }
     ref->configListener = env->NewGlobalRef(tmp);
 
-    fid = cache.findField(
+    fid = lookup.findField(
         cls, "eventListener", "Lcom/zerotier/sdk/EventListener;");
     if(fid == NULL)
     {
@@ -758,7 +758,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     uint64_t now = (uint64_t)in_now;
 
     // get the java.net.InetSocketAddress class and getAddress() method
-    jclass inetAddressClass = cache.findClass("java/net/InetAddress");
+    jclass inetAddressClass = lookup.findClass("java/net/InetAddress");
     if(inetAddressClass == NULL)
     {
         LOGE("Can't find InetAddress class");
@@ -766,7 +766,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    jmethodID getAddressMethod = cache.findMethod(
+    jmethodID getAddressMethod = lookup.findMethod(
         inetAddressClass, "getAddress", "()[B");
     if(getAddressMethod == NULL)
     {
@@ -774,13 +774,13 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    jclass InetSocketAddressClass = cache.findClass("java/net/InetSocketAddress");
+    jclass InetSocketAddressClass = lookup.findClass("java/net/InetSocketAddress");
     if(InetSocketAddressClass == NULL)
     {
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    jmethodID inetSockGetAddressMethod = cache.findMethod(
+    jmethodID inetSockGetAddressMethod = lookup.findMethod(
         InetSocketAddressClass, "getAddress", "()Ljava/net/InetAddress;");
 
     jobject addrObject = env->CallObjectMethod(in_remoteAddress, inetSockGetAddressMethod);
@@ -790,7 +790,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
 
-    jmethodID inetSock_getPort = cache.findMethod(
+    jmethodID inetSock_getPort = lookup.findMethod(
         InetSocketAddressClass, "getPort", "()I");
 
     if(env->ExceptionCheck() || inetSock_getPort == NULL) 
@@ -1059,13 +1059,13 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_status
     jmethodID nodeStatusConstructor = NULL;
 
     // create a com.zerotier.sdk.NodeStatus object
-    nodeStatusClass = cache.findClass("com/zerotier/sdk/NodeStatus");
+    nodeStatusClass = lookup.findClass("com/zerotier/sdk/NodeStatus");
     if(nodeStatusClass == NULL)
     {
         return NULL;
     }
     
-    nodeStatusConstructor = cache.findMethod(
+    nodeStatusConstructor = lookup.findMethod(
         nodeStatusClass, "<init>", "()V");
     if(nodeStatusConstructor == NULL)
     {
@@ -1086,25 +1086,25 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_status
     jfieldID secretIdentityField = NULL;
     jfieldID onlineField = NULL;
 
-    addressField = cache.findField(nodeStatusClass, "address", "J");
+    addressField = lookup.findField(nodeStatusClass, "address", "J");
     if(addressField == NULL)
     {
         return NULL;
     }
 
-    publicIdentityField = cache.findField(nodeStatusClass, "publicIdentity", "Ljava/lang/String;");
+    publicIdentityField = lookup.findField(nodeStatusClass, "publicIdentity", "Ljava/lang/String;");
     if(publicIdentityField == NULL)
     {
         return NULL;
     }
 
-    secretIdentityField = cache.findField(nodeStatusClass, "secretIdentity", "Ljava/lang/String;");
+    secretIdentityField = lookup.findField(nodeStatusClass, "secretIdentity", "Ljava/lang/String;");
     if(secretIdentityField == NULL)
     {
         return NULL;
     }
 
-    onlineField = cache.findField(nodeStatusClass, "online", "Z");
+    onlineField = lookup.findField(nodeStatusClass, "online", "Z");
     if(onlineField == NULL)
     {
         return NULL;
@@ -1207,7 +1207,7 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_peers(
         return NULL;
     }
 
-    jclass peerClass = cache.findClass("com/zerotier/sdk/Peer");
+    jclass peerClass = lookup.findClass("com/zerotier/sdk/Peer");
     if(env->ExceptionCheck() || peerClass == NULL)
     {
         LOGE("Error finding Peer class");
@@ -1265,7 +1265,7 @@ JNIEXPORT jobjectArray JNICALL Java_com_zerotier_sdk_Node_networks(
         return NULL;
     }
 
-    jclass vnetConfigClass = cache.findClass("com/zerotier/sdk/VirtualNetworkConfig");
+    jclass vnetConfigClass = lookup.findClass("com/zerotier/sdk/VirtualNetworkConfig");
     if(env->ExceptionCheck() || vnetConfigClass == NULL)
     {
         LOGE("Error finding VirtualNetworkConfig class");
-- 
cgit v1.2.3


From abbcb0a12cbab782c1d9879391efb65e9cd92acf Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 13 Jun 2015 14:38:04 -0700
Subject: Modified ant build script so that it can be integrated with Android
 Studio's build system

---
 java/build.xml | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

(limited to 'java')

diff --git a/java/build.xml b/java/build.xml
index e24a0e13..93d754a6 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -1,4 +1,4 @@
-<project default="build" name="ZeroTierOneSDK" basedir=".">
+<project default="build_jar" name="ZeroTierOneSDK" basedir=".">
     <property environment="env"/>
 
     <condition property="isWindows">
@@ -9,7 +9,7 @@
       <os family="mac"/>
     </condition>
 
-    <target name="clean">
+    <target name="clean_ant">
         <delete dir="bin" failonerror="false"/>
         <delete dir="classes" failonerror="false"/>
         <delete dir="build_win32" failonerror="false"/>
@@ -24,6 +24,10 @@
         <echo message="os.arch          = ${os.arch}"/>
         <echo message="ant.java.version = ${ant.java.version}"/>
         <echo message="java.version     = ${java.version}"/>
+        <echo message="ndk.loc          = ${env.NDK_BUILD_LOC}"/>
+        <echo message="sdk.loc          = ${env.ANDROID_PLATFORM}"/>
+        <echo message="user.dir         = ${user.dir}"/>
+        <echo message="zt1.dir          = ${env.ZT}"/>
         <mkdir dir="bin"/>
         <mkdir dir="classes"/>
         <javac srcdir="src"
@@ -36,20 +40,20 @@
 
     <target name="build_android">
         <exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
-            <arg value="ZT1=${user.dir}/../"/>
+            <arg value="ZT1=${env.ZT}"/>
             <arg value="V=1"/>
         </exec>
         <copy file="libs/armeabi/libZeroTierOneJNI.so" 
-              tofile="${user.dir}/classes/lib/armeabi/libZeroTierOneJNI.so" 
+              tofile="classes/lib/armeabi/libZeroTierOneJNI.so"
               overwrite="true"/>
         <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
-              tofile="${user.dir}/classes/lib/arm64-v8a/libZeroTierOneJNI.so"
+              tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"
               overwrite="true"/>
         <copy file="libs/armeabi-v7a/libZeroTierOneJNI.so"
-              tofile="${user.dir}/classes/lib/armeabi-v7a/libZeroTierOneJNI.so"
+              tofile="classes/lib/armeabi-v7a/libZeroTierOneJNI.so"
               overwrite="true"/>
         <copy file="libs/x86/libZeroTierOneJNI.so"
-              tofile="${user.dir}/classes/lib/x86/libZeroTierOneJNI.so"
+              tofile="classes/lib/x86/libZeroTierOneJNI.so"
               overwrite="true"/>
     </target>
 
@@ -91,7 +95,7 @@
             overwrite="true"/>
     </target>
 
-    <target name="build" depends="build_java,build_android,windows,mac">    
+    <target name="build_jar" depends="build_java,build_android,windows,mac">
         <jar destfile="bin/ZeroTierOneSDK.jar" basedir="classes"/>
     </target>
 
@@ -101,23 +105,4 @@
       <javadoc sourcepath="src/"
                destdir="doc/"/>
     </target>
-
-<!--    <target name="android" depends="build">
-        <echo message="OS is Android, installing..."/>
-        <copy file="libs/armeabi/libZeroTierOneJNI.so" 
-              tofile="${aproj_loc}/libs/armeabi/libZeroTierOneJNI.so" 
-              overwrite="true"/>
-        <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
-              tofile="${aproj_loc}/libs/arm64-v8a/libZeroTierOneJNI.so"
-              overwrite="true"/>
-        <copy file="libs/armeabi-v7a/libZeroTierOneJNI.so"
-              tofile="${aproj_loc}/libs/armeabi-v7a/libZeroTierOneJNI.so"
-              overwrite="true"/>
-        <copy file="libs/x86/libZeroTierOneJNI.so"
-              tofile="${aproj_loc}/libs/x86/libZeroTierOneJNI.so"
-              overwrite="true"/>
-        <copy   file="bin/ZeroTierOneSDK.jar" 
-                tofile="${aproj_loc}/libs/ZeroTierOneSDK.jar" 
-                overwrite="true"/>
-    </target> -->
 </project>
\ No newline at end of file
-- 
cgit v1.2.3


From adf89901c4d2de0d2338889a7fa1e5df1ab6b9be Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Fri, 19 Jun 2015 19:00:06 -0700
Subject: dont consider multicast groups in VirtualNetworkConfig.equals()

---
 java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'java')

diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 35453ddc..980f48f7 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -55,18 +55,6 @@ public final class VirtualNetworkConfig {
     }
 
     public boolean equals(VirtualNetworkConfig cfg) {
-        boolean mcgEqual = true;
-        if(multicastSubscriptions.length == cfg.multicastSubscriptions.length) {
-            for(int i = 0; i < multicastSubscriptions.length; ++i) {
-                if(!multicastSubscriptions[i].equals(cfg.multicastSubscriptions[i]))
-                {
-                    return false;
-                }
-            }
-        } else {
-            mcgEqual = false;
-        }
-
         boolean aaEqual = true;
         if(assignedAddresses.length == cfg.assignedAddresses.length) {
             for(int i = 0; i < assignedAddresses.length; ++i) {
@@ -89,7 +77,7 @@ public final class VirtualNetworkConfig {
                broadcastEnabled == cfg.broadcastEnabled &&
                portError == cfg.portError &&
                enabled == cfg.enabled &&
-               mcgEqual && aaEqual;
+               aaEqual;
     }
 
     /**
-- 
cgit v1.2.3


From 759d71037ef429c0277d8bebe16cc4ac1f426c45 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 23 Jun 2015 23:03:02 -0700
Subject: added Comparable interface to VirtualNetworkConfig so we can sort
 arrays containing it.

---
 java/src/com/zerotier/sdk/VirtualNetworkConfig.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
index 980f48f7..278fafd2 100644
--- a/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
+++ b/java/src/com/zerotier/sdk/VirtualNetworkConfig.java
@@ -27,11 +27,13 @@
 
 package com.zerotier.sdk;
 
+import java.lang.Comparable;
+import java.lang.Override;
 import java.lang.String;
 import java.util.ArrayList;
 import java.net.InetSocketAddress;
 
-public final class VirtualNetworkConfig {
+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;
 
@@ -80,6 +82,14 @@ public final class VirtualNetworkConfig {
                aaEqual;
     }
 
+    public int compareTo(VirtualNetworkConfig cfg) {
+        if(cfg.nwid == this.nwid) {
+            return 0;
+        } else {
+            return this.nwid > cfg.nwid ? 1 : -1;
+        }
+    }
+
     /**
      * 64-bit ZeroTier network ID
      */
-- 
cgit v1.2.3


From bfb152f53f528934583ee76437453a005610a7ea Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 24 Jun 2015 20:31:22 -0700
Subject: configure the NDK to build all supported ABIs and package them up in
 the jar

---
 java/build.xml          | 15 ++++++++++++---
 java/jni/Application.mk |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/build.xml b/java/build.xml
index 93d754a6..4bc1cdc0 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -43,18 +43,27 @@
             <arg value="ZT1=${env.ZT}"/>
             <arg value="V=1"/>
         </exec>
-        <copy file="libs/armeabi/libZeroTierOneJNI.so" 
-              tofile="classes/lib/armeabi/libZeroTierOneJNI.so"
-              overwrite="true"/>
         <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
               tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"
               overwrite="true"/>
+        <copy file="libs/armeabi/libZeroTierOneJNI.so" 
+              tofile="classes/lib/armeabi/libZeroTierOneJNI.so"
+              overwrite="true"/>
         <copy file="libs/armeabi-v7a/libZeroTierOneJNI.so"
               tofile="classes/lib/armeabi-v7a/libZeroTierOneJNI.so"
               overwrite="true"/>
+        <copy file="libs/mips/libZeroTierOneJNI.so"
+              tofile="classes/lib/mips/libZeroTierOneJNI.so"
+              overwrite="true"/>
+        <copy file="libs/mips64/libZeroTierOneJNI.so"
+              tofile="classes/lib/mips64/libZeroTierOne.so"
+              overwrite="true"/>
         <copy file="libs/x86/libZeroTierOneJNI.so"
               tofile="classes/lib/x86/libZeroTierOneJNI.so"
               overwrite="true"/>
+        <copy file="libs/x86_64/libZeroTierOneJNI.so"
+              tofile="classes/lib/x86_64/libZeroTierOneJNI.so"
+              overwrite="true"/>
     </target>
 
 
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 3118ec2e..8b6c8020 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,4 +1,5 @@
 APP_ABI := armeabi armeabi-v7a arm64-v8a x86
 APP_STL := gnustl_static
-APP_CPPFLAGS += -Wall -fPIE -fstack-protector -fexceptions -DZT_TRACE
-
+APP_CPPFLAGS += -Wall -fPIE -fstack-protector -fexceptions
+APP_PLATFORM := android-14
+APP_ABI := all
-- 
cgit v1.2.3


From c9919cc5bae5c06980a701b8a4fa4d31805d4428 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Fri, 26 Jun 2015 18:26:57 -0700
Subject: reflect changes to ZT1_PeerRole in JNI

---
 java/jni/ZT1_jniutils.cpp               | 8 ++++----
 java/src/com/zerotier/sdk/PeerRole.java | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'java')

diff --git a/java/jni/ZT1_jniutils.cpp b/java/jni/ZT1_jniutils.cpp
index 6b877417..90f3bb84 100644
--- a/java/jni/ZT1_jniutils.cpp
+++ b/java/jni/ZT1_jniutils.cpp
@@ -171,11 +171,11 @@ jobject createPeerRole(JNIEnv *env, ZT1_PeerRole role)
     case ZT1_PEER_ROLE_LEAF:
         fieldName = "PEER_ROLE_LEAF";
         break;
-    case ZT1_PEER_ROLE_HUB:
-        fieldName = "PEER_ROLE_HUB";
+    case ZT1_PEER_ROLE_RELAY:
+        fieldName = "PEER_ROLE_RELAY";
         break;
-    case ZT1_PEER_ROLE_ROOTSERVER:
-        fieldName = "PEER_ROLE_ROOTSERVER";
+    case ZT1_PEER_ROLE_ROOT:
+        fieldName = "PEER_ROLE_ROOT";
         break;
     }
 
diff --git a/java/src/com/zerotier/sdk/PeerRole.java b/java/src/com/zerotier/sdk/PeerRole.java
index 7a5156e1..d7d55f05 100644
--- a/java/src/com/zerotier/sdk/PeerRole.java
+++ b/java/src/com/zerotier/sdk/PeerRole.java
@@ -34,12 +34,12 @@ public enum PeerRole {
     PEER_ROLE_LEAF,
 
     /**
-     * Locally federated hub
+     * relay node
      */
-    PEER_ROLE_HUB,
+    PEER_ROLE_RELAY,
 
     /**
-     * planetary rootserver
+     * root server
      */
-    PEER_ROLE_ROOTSERVER
+    PEER_ROLE_ROOT
 }
\ No newline at end of file
-- 
cgit v1.2.3


From aee8e95d4961195b3251bcc8581677a8f0c0cdd8 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 30 Jun 2015 19:21:46 -0700
Subject: logging

---
 java/jni/com_zerotierone_sdk_Node.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index aa42c548..ca4c4838 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -365,7 +365,7 @@ namespace {
             env->ReleasePrimitiveArrayCritical(objectSizeObj, objSize, 0);
         }
 
-        LOGI("Out Object Size: %lu", *out_objectSize);
+        LOGV("Out Object Size: %lu", *out_objectSize);
 
         return retval;
     }
@@ -410,12 +410,14 @@ namespace {
 
         if(buffer == NULL)
         {
+            LOGD("JNI: Delete file: %s", objectName);
             // delete operation
             return env->CallIntMethod(
                 ref->dataStorePutListener, deleteMethod, nameStr);
         }
         else
         {
+            LOGD("JNI: Write file: %s", objectName);
             // set operation
             jbyteArray bufferObj = env->NewByteArray(bufferSize);
             if(env->ExceptionCheck() || bufferObj == NULL)
-- 
cgit v1.2.3


From f803dd5ff46cc03e07364961eb23feb64b7697bd Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 1 Jul 2015 18:13:39 -0700
Subject: ...

---
 java/build.xml                        | 1 +
 java/jni/Android.mk                   | 1 +
 java/jni/com_zerotierone_sdk_Node.cpp | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/build.xml b/java/build.xml
index 4bc1cdc0..4604ad66 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -42,6 +42,7 @@
         <exec dir="jni" executable="${env.NDK_BUILD_LOC}" failonerror="true">
             <arg value="ZT1=${env.ZT}"/>
             <arg value="V=1"/>
+            <!-- <arg value="NDK_DEBUG=1"/> -->
         </exec>
         <copy file="libs/arm64-v8a/libZeroTierOneJNI.so"
               tofile="classes/lib/arm64-v8a/libZeroTierOneJNI.so"
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index 9986c2c3..15ba3875 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -5,6 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ZeroTierOneJNI
 LOCAL_C_INCLUDES := $(ZT1)/include
 LOCAL_LDLIBS := -llog
+# LOCAL_CFLAGS := -g
 
 # ZeroTierOne SDK source files
 LOCAL_SRC_FILES := \
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index ca4c4838..e8f7272b 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -192,7 +192,11 @@ namespace {
     {
         LOGV("EventCallback");
         JniRef *ref = (JniRef*)userData;
-        assert(ref->node == node);
+        if(ref->node != node)
+        {
+            LOGE("Nodes not equal. ref->node %p, node %p", ref->node, node);
+            return;
+        }
         JNIEnv *env = NULL;
         ref->jvm->GetEnv((void**)&env, JNI_VERSION_1_6);
 
@@ -613,6 +617,8 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
         &VirtualNetworkConfigFunctionCallback,
         &EventCallback);
 
+    LOGI("Node Created.");
+    
     if(rc != ZT1_RESULT_OK)
     {
         LOGE("Error creating Node: %d", rc);
-- 
cgit v1.2.3


From 0b7cd2f40a9502a797eff49db12f6f892e319f45 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 1 Jul 2015 20:26:14 -0700
Subject: change some build settings.  add a lock

---
 java/CMakeLists.txt                   |  1 +
 java/jni/Android.mk                   |  1 +
 java/jni/Application.mk               |  6 +++---
 java/jni/com_zerotierone_sdk_Node.cpp | 23 ++++++++++++++++++++---
 4 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'java')

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 382fd3cd..484517f8 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -59,6 +59,7 @@ set(src_files
 
 set(include_dirs
     ${CMAKE_CURRENT_SOURCE_DIR}/../include/
+    ${CMAKE_CURRENT_SOURCE_DIR}/../node/
     ${Java_INCLUDE_DIRS})
 
 if(WIN32)
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index 15ba3875..56e6fb80 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -4,6 +4,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := ZeroTierOneJNI
 LOCAL_C_INCLUDES := $(ZT1)/include
+LOCAL_C_INCLUDES += $(ZT1)/node
 LOCAL_LDLIBS := -llog
 # LOCAL_CFLAGS := -g
 
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 8b6c8020..0f369730 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,5 +1,5 @@
-APP_ABI := armeabi armeabi-v7a arm64-v8a x86
-APP_STL := gnustl_static
-APP_CPPFLAGS += -Wall -fPIE -fstack-protector -fexceptions
+NDK_TOOLCHAIN_VERSION := clang
+APP_STL := c++_static
+APP_CPPFLAGS := -O2 -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing
 APP_PLATFORM := android-14
 APP_ABI := all
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index e8f7272b..e98342e7 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -30,6 +30,7 @@
 #include "ZT1_jnilookup.h"
 
 #include <ZeroTierOne.h>
+#include "Mutex.hpp"
 
 #include <map>
 #include <string>
@@ -192,9 +193,9 @@ namespace {
     {
         LOGV("EventCallback");
         JniRef *ref = (JniRef*)userData;
-        if(ref->node != node)
+        if(ref->node != node && event != ZT1_EVENT_UP)
         {
-            LOGE("Nodes not equal. ref->node %p, node %p", ref->node, node);
+            LOGE("Nodes not equal. ref->node %p, node %p. Event: %d", ref->node, node, event);
             return;
         }
         JNIEnv *env = NULL;
@@ -478,9 +479,11 @@ namespace {
 
     typedef std::map<uint64_t, JniRef*> NodeMap;
     static NodeMap nodeMap;
+    ZeroTier::Mutex nodeMapMutex;
 
     ZT1_Node* findNode(uint64_t nodeId)
     {
+        ZeroTier::Mutex::Lock lock(nodeMapMutex);
         NodeMap::iterator found = nodeMap.find(nodeId);
         if(found != nodeMap.end())
         {
@@ -633,8 +636,10 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
         return resultObject;
     }
 
+    ZeroTier::Mutex::Lock lock(nodeMapMutex);
     ref->node = node;
     nodeMap.insert(std::make_pair(ref->id, ref));
+    
 
     return resultObject;
 }
@@ -650,7 +655,12 @@ JNIEXPORT void JNICALL Java_com_zerotier_sdk_Node_node_1delete(
     LOGV("Destroying ZT1_Node struct");
     uint64_t nodeId = (uint64_t)id;
 
-    NodeMap::iterator found = nodeMap.find(nodeId);
+    NodeMap::iterator found;
+    {
+        ZeroTier::Mutex::Lock lock(nodeMapMutex);  
+        found = nodeMap.find(nodeId);
+    }
+
     if(found != nodeMap.end())
     {
         JniRef *ref = found->second;
@@ -819,6 +829,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     jbyteArray addressArray = (jbyteArray)env->CallObjectMethod(addrObject, getAddressMethod);
     if(addressArray == NULL)
     {
+        LOGE("Unable to call getAddress()");
         // unable to call getAddress()
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
     }
@@ -849,6 +860,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     }
     else
     {
+        LOGE("Unknown IP version");
         // unknown address type
         env->ReleasePrimitiveArrayCritical(addressArray, addr, 0);
         return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
@@ -856,6 +868,11 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_processWirePacket(
     env->ReleasePrimitiveArrayCritical(addressArray, addr, 0);
 
     unsigned int packetLength = env->GetArrayLength(in_packetData);
+    if(packetLength == 0)
+    {
+        LOGE("Empty packet?!?");
+        return createResultObject(env, ZT1_RESULT_FATAL_ERROR_INTERNAL);
+    }
     void *packetData = env->GetPrimitiveArrayCritical(in_packetData, NULL);
     void *localData = malloc(packetLength);
     memcpy(localData, packetData, packetLength);
-- 
cgit v1.2.3


From ab34884e3e47eb611d42312eb05079119f62e8b8 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Fri, 3 Jul 2015 18:14:50 -0700
Subject: Set -O0

anything above that currently goes kaboom on ARM platforms
---
 java/jni/Application.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 0f369730..5f68ef6e 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,5 +1,5 @@
 NDK_TOOLCHAIN_VERSION := clang
 APP_STL := c++_static
-APP_CPPFLAGS := -O2 -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing
+APP_CPPFLAGS := -O0 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing
 APP_PLATFORM := android-14
 APP_ABI := all
-- 
cgit v1.2.3


From a408e5f6858a0e2f13c27e56f203b35f64ab07e7 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Wed, 8 Jul 2015 17:59:53 -0700
Subject: set ZT_NO_TYPE_PUNNING and -O3 for Android builds

---
 java/jni/Application.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 5f68ef6e..2a789787 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,5 +1,5 @@
 NDK_TOOLCHAIN_VERSION := clang
 APP_STL := c++_static
-APP_CPPFLAGS := -O0 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing
+APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -DZT_NO_TYPE_PUNNING=1
 APP_PLATFORM := android-14
 APP_ABI := all
-- 
cgit v1.2.3


From e45475c5b5bcee4fb88e797a50eb38b6ad3d6923 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Thu, 9 Jul 2015 20:26:23 -0700
Subject: fixed a misspelling

---
 java/src/com/zerotier/sdk/EventListener.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/src/com/zerotier/sdk/EventListener.java b/java/src/com/zerotier/sdk/EventListener.java
index 078023d9..bb191c1d 100644
--- a/java/src/com/zerotier/sdk/EventListener.java
+++ b/java/src/com/zerotier/sdk/EventListener.java
@@ -42,7 +42,7 @@ public interface EventListener {
     public void onEvent(Event event);
     
     /**
-     * Callback for network error events: {@link Event.EVENT_AUTHENTICATION_FAILUER}, {link Event.EVENT_INVALID_PACKET}
+     * Callback for network error events: {@link Event.EVENT_AUTHENTICATION_FAILURE}, {link Event.EVENT_INVALID_PACKET}
      *
      * @param event {@link Event} enum
      * @param source {@link InetSocketAddress} containing the origin address of the packet
-- 
cgit v1.2.3


From 0b9e5928d35c43748d8cd413e05e5718f7b1fc52 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 26 Sep 2015 13:53:38 -0700
Subject: update PacketSender interface

---
 java/src/com/zerotier/sdk/PacketSender.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/src/com/zerotier/sdk/PacketSender.java b/java/src/com/zerotier/sdk/PacketSender.java
index 5302f5ce..ab31729b 100644
--- a/java/src/com/zerotier/sdk/PacketSender.java
+++ b/java/src/com/zerotier/sdk/PacketSender.java
@@ -37,11 +37,13 @@ public interface PacketSender {
      * on failure. Note that success does not (of course) guarantee packet
      * delivery. It only means that the packet appears to have been sent.</p>
      *
-     * @param addr {@link InetSocketAddress} to send to
+     * @param localAddr {@link InetSocketAddress} to send from.  Set to null if not specified.
+     * @param remoteAddr {@link InetSocketAddress} to send to
      * @param packetData data to send
      * @return 0 on success, any error code on failure.
      */
     public int onSendPacketRequested(
-            InetSocketAddress addr,
+            InetSocketAddress localAddr,
+            InetSocketAddress remoteAddr,
             byte[] packetData);
 }
-- 
cgit v1.2.3


From 7c3be2b5c152e8631237c1050e0c90ad37dfcb1d Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 26 Sep 2015 14:10:16 -0700
Subject: fix function signature in lookup for onSendPacketRequested function

---
 java/jni/com_zerotierone_sdk_Node.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index e513cdf5..e1b69d1e 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -462,7 +462,7 @@ namespace {
         }
 
         jmethodID packetSenderCallbackMethod = lookup.findMethod(packetSenderClass,
-            "onSendPacketRequested", "(Ljava/net/InetSocketAddress;[B)I");
+            "onSendPacketRequested", "(Ljava/net/InetSocketAddress;Ljava/net/InetSocketAddress;[B)I");
         if(packetSenderCallbackMethod == NULL)
         {
             LOGE("Couldn't find onSendPacketRequested method");
-- 
cgit v1.2.3


From 75a191a8564030f4d5e99aca76b980e2d69abd20 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 26 Sep 2015 14:10:45 -0700
Subject: don't create an InetSocketAddress on local address if it's equal to
 ZT_SOCKADDR_NULL

---
 java/jni/com_zerotierone_sdk_Node.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index e1b69d1e..e6042649 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -469,7 +469,12 @@ namespace {
             return -2;
         }
         
-        jobject localAddressObj = newInetSocketAddress(env, *localAddress);
+        jobject localAddressObj = NULL;
+        if(memcmp(localAddress, &ZT_SOCKADDR_NULL, sizeof(sockaddr_storage)) != 0)
+        {
+            localAddressObj = newInetSocketAddress(env, *localAddress);
+        }
+
         jobject remoteAddressObj = newInetSocketAddress(env, *remoteAddress);
         jbyteArray bufferObj = env->NewByteArray(bufferSize);
         env->SetByteArrayRegion(bufferObj, 0, bufferSize, (jbyte*)buffer);
-- 
cgit v1.2.3


From b7df177f33fd7a98da18ed9f756ee7272982a65d Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Mon, 2 Nov 2015 19:18:55 -0800
Subject: updates for origin/edge

---
 java/jni/Android.mk                          |  2 +-
 java/jni/Application.mk                      |  2 +-
 java/jni/ZT_jniutils.cpp                     | 18 --------
 java/jni/com_zerotierone_sdk_Node.cpp        | 64 ++++++----------------------
 java/src/com/zerotier/sdk/Event.java         | 25 -----------
 java/src/com/zerotier/sdk/EventListener.java | 15 -------
 6 files changed, 15 insertions(+), 111 deletions(-)

(limited to 'java')

diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index 22dfe4f1..3da3b04b 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -15,7 +15,6 @@ LOCAL_SRC_FILES := \
 	$(ZT1)/ext/http-parser/http_parser.c \
 	$(ZT1)/node/C25519.cpp \
 	$(ZT1)/node/CertificateOfMembership.cpp \
-	$(ZT1)/node/Defaults.cpp \
 	$(ZT1)/node/Dictionary.cpp \
 	$(ZT1)/node/Identity.cpp \
 	$(ZT1)/node/IncomingPacket.cpp \
@@ -26,6 +25,7 @@ LOCAL_SRC_FILES := \
 	$(ZT1)/node/Node.cpp \
 	$(ZT1)/node/OutboundMulticast.cpp \
 	$(ZT1)/node/Packet.cpp \
+	$(ZT1)/node/Path.cpp \
 	$(ZT1)/node/Peer.cpp \
 	$(ZT1)/node/Poly1305.cpp \
 	$(ZT1)/node/Salsa20.cpp \
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
index 2a789787..608e94c0 100644
--- a/java/jni/Application.mk
+++ b/java/jni/Application.mk
@@ -1,5 +1,5 @@
 NDK_TOOLCHAIN_VERSION := clang
 APP_STL := c++_static
-APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -DZT_NO_TYPE_PUNNING=1
+APP_CPPFLAGS := -O3 -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
 APP_PLATFORM := android-14
 APP_ABI := all
diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp
index bd8d8708..ae1aa929 100644
--- a/java/jni/ZT_jniutils.cpp
+++ b/java/jni/ZT_jniutils.cpp
@@ -133,15 +133,6 @@ jobject createEvent(JNIEnv *env, ZT_Event event)
     case ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION:
         fieldName = "EVENT_FATAL_ERROR_IDENTITY_COLLISION";
         break;
-    case ZT_EVENT_SAW_MORE_RECENT_VERSION:
-        fieldName = "EVENT_SAW_MORE_RECENT_VERSION";
-        break;
-    case ZT_EVENT_AUTHENTICATION_FAILURE:
-        fieldName = "EVENT_AUTHENTICATION_FAILURE";
-        break;
-    case ZT_EVENT_INVALID_PACKET:
-        fieldName = "EVENT_INVALID_PACKET";
-        break;
     case ZT_EVENT_TRACE:
         fieldName = "EVENT_TRACE";
         break;
@@ -425,7 +416,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
     jfieldID addressField = NULL;
     jfieldID lastSendField = NULL;
     jfieldID lastReceiveField = NULL;
-    jfieldID fixedField = NULL;
     jfieldID activeField = NULL;
     jfieldID preferredField = NULL;
 
@@ -459,13 +449,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
         return NULL;
     }
 
-    fixedField = lookup.findField(pppClass, "fixed", "Z");
-    if(env->ExceptionCheck() || fixedField == NULL)
-    {
-        LOGE("Error finding fixed field");
-        return NULL;
-    }
-
     activeField = lookup.findField(pppClass, "active", "Z");
     if(env->ExceptionCheck() || activeField == NULL)
     {
@@ -503,7 +486,6 @@ jobject newPeerPhysicalPath(JNIEnv *env, const ZT_PeerPhysicalPath &ppp)
     env->SetObjectField(pppObject, addressField, addressObject);
     env->SetLongField(pppObject, lastSendField, ppp.lastSend);
     env->SetLongField(pppObject, lastReceiveField, ppp.lastReceive);
-    env->SetBooleanField(pppObject, fixedField, ppp.fixed);
     env->SetBooleanField(pppObject, activeField, ppp.active);
     env->SetBooleanField(pppObject, preferredField, ppp.preferred);
 
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index e6042649..a4c677b7 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -134,7 +134,8 @@ namespace {
             (jlong)nwid, operationObject, networkConfigObject);
     }
 
-    void VirtualNetworkFrameFunctionCallback(ZT_Node *node,void *userData,
+    void VirtualNetworkFrameFunctionCallback(ZT_Node *node,
+        void *userData,
         uint64_t nwid,
         uint64_t sourceMac,
         uint64_t destMac,
@@ -189,7 +190,10 @@ namespace {
     }
 
 
-    void EventCallback(ZT_Node *node,void *userData,enum ZT_Event event, const void *data)
+    void EventCallback(ZT_Node *node,
+        void *userData,
+        enum ZT_Event event, 
+        const void *data)
     {
         LOGV("EventCallback");
         JniRef *ref = (JniRef*)userData;
@@ -217,25 +221,6 @@ namespace {
             return;
         }
 
-
-        jmethodID onOutOfDateMethod = lookup.findMethod(eventListenerClass,
-            "onOutOfDate", "(Lcom/zerotier/sdk/Version;)V");
-        if(onOutOfDateMethod == NULL)
-        {
-            LOGE("Couldn't find onOutOfDate method");
-            return;
-        }
-
-
-        jmethodID onNetworkErrorMethod = lookup.findMethod(eventListenerClass,
-            "onNetworkError", "(Lcom/zerotier/sdk/Event;Ljava/net/InetSocketAddress;)V");
-        if(onNetworkErrorMethod == NULL)
-        {
-            LOGE("Couldn't find onNetworkError method");
-            return;
-        }
-
-
         jmethodID onTraceMethod = lookup.findMethod(eventListenerClass,
             "onTrace", "(Ljava/lang/String;)V");
         if(onTraceMethod == NULL)
@@ -263,31 +248,6 @@ namespace {
             env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
         }
         break;
-        case ZT_EVENT_SAW_MORE_RECENT_VERSION:
-        {
-            LOGV("Version Event");
-            // call onOutOfDate()
-            if(data != NULL)
-            {
-                int *version = (int*)data;
-                jobject verisonObj = newVersion(env, version[0], version[1], version[2], 0);
-                env->CallVoidMethod(ref->eventListener, onOutOfDateMethod, verisonObj);
-            }
-        }
-        break;
-        case ZT_EVENT_AUTHENTICATION_FAILURE:
-        case ZT_EVENT_INVALID_PACKET:
-        {
-            LOGV("Network Error Event");
-            // call onNetworkError()
-            if(data != NULL)
-            {
-                sockaddr_storage *addr = (sockaddr_storage*)data;
-                jobject addressObj = newInetSocketAddress(env, *addr);
-                env->CallVoidMethod(ref->eventListener, onNetworkErrorMethod, addressObj);
-            }
-        }
-        break;
         case ZT_EVENT_TRACE:
         {
             LOGV("Trace Event");
@@ -303,7 +263,8 @@ namespace {
         }
     }
 
-    long DataStoreGetFunction(ZT_Node *node,void *userData,
+    long DataStoreGetFunction(ZT_Node *node,
+        void *userData,
         const char *objectName,
         void *buffer,
         unsigned long bufferSize,
@@ -375,7 +336,8 @@ namespace {
         return retval;
     }
 
-    int DataStorePutFunction(ZT_Node *node,void *userData,
+    int DataStorePutFunction(ZT_Node *node,
+        void *userData,
         const char *objectName,
         const void *buffer,
         unsigned long bufferSize,
@@ -440,7 +402,8 @@ namespace {
         }
     }
 
-    int WirePacketSendFunction(ZT_Node *node,void *userData,\
+    int WirePacketSendFunction(ZT_Node *node,
+        void *userData,
         const struct sockaddr_storage *localAddress,
         const struct sockaddr_storage *remoteAddress,
         const void *buffer,
@@ -625,8 +588,7 @@ JNIEXPORT jobject JNICALL Java_com_zerotier_sdk_Node_node_1init(
         &WirePacketSendFunction,
         &VirtualNetworkFrameFunctionCallback,
         &VirtualNetworkConfigFunctionCallback,
-        &EventCallback,
-        NULL);
+        &EventCallback);
 
     if(rc != ZT_RESULT_OK)
     {
diff --git a/java/src/com/zerotier/sdk/Event.java b/java/src/com/zerotier/sdk/Event.java
index 436b1b22..22d350e1 100644
--- a/java/src/com/zerotier/sdk/Event.java
+++ b/java/src/com/zerotier/sdk/Event.java
@@ -86,31 +86,6 @@ public enum Event {
      * umbrellas prevent rain and smoke detectors prevent fires. They do, right?</p>
      */
 	EVENT_FATAL_ERROR_IDENTITY_COLLISION,
-    
-    /**
-     * A more recent version was observed on the network
-     * 
-     * <p>Right now this is only triggered if a hub or rootserver reports a
-     * more recent version, and only once. It can be used to trigger a
-     * software update check.</p>
-     * 
-     * <p>Meta-data: {@link Version}, more recent version number</p>
-     */
-    EVENT_SAW_MORE_RECENT_VERSION,
-
-    /**
-     * A packet failed authentication
-     *
-     * <p>Meta-data: {@link InetSocketAddress} containing origin address of packet</p>
-     */
-	EVENT_AUTHENTICATION_FAILURE,
-
-    /**
-     * A received packet was not valid
-     *
-     * <p>Meta-data: {@link InetSocketAddress} containing origin address of packet</p>
-     */
-	EVENT_INVALID_PACKET,
 
     /**
      * Trace (debugging) message
diff --git a/java/src/com/zerotier/sdk/EventListener.java b/java/src/com/zerotier/sdk/EventListener.java
index bb191c1d..91050aaa 100644
--- a/java/src/com/zerotier/sdk/EventListener.java
+++ b/java/src/com/zerotier/sdk/EventListener.java
@@ -41,21 +41,6 @@ public interface EventListener {
      */
     public void onEvent(Event event);
     
-    /**
-     * Callback for network error events: {@link Event.EVENT_AUTHENTICATION_FAILURE}, {link Event.EVENT_INVALID_PACKET}
-     *
-     * @param event {@link Event} enum
-     * @param source {@link InetSocketAddress} containing the origin address of the packet
-     */
-    public void onNetworkError(Event event, InetSocketAddress source);
-
-    /**
-     * Callback when the node detects that it's out of date.
-     *
-     * @param newVersion {@link Version} object with the latest version of ZeroTier One
-     */
-    public void onOutOfDate(Version newVersion);
-
     /**
      * Trace messages
      * 
-- 
cgit v1.2.3


From eadeac0a42888a6f2fa53e2a802c6c4e43c055b3 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 3 Nov 2015 19:14:11 -0800
Subject: logging of events

---
 java/jni/com_zerotierone_sdk_Node.cpp | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'java')

diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index a4c677b7..17a9917a 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -238,12 +238,32 @@ namespace {
         switch(event)
         {
         case ZT_EVENT_UP:
+        {
+            LOGD("Event Up");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
+        }
         case ZT_EVENT_OFFLINE:
+        {
+            LOGD("Event Offline");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
+        }
         case ZT_EVENT_ONLINE:
+        {
+            LOGD("Event Online");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
+        }
         case ZT_EVENT_DOWN:
+        {
+            LOGD("Event Down");
+            env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
+            break;
+        }
         case ZT_EVENT_FATAL_ERROR_IDENTITY_COLLISION:
         {
-            LOGV("Regular Event");
+            LOGV("Identity Collision");
             // call onEvent()
             env->CallVoidMethod(ref->eventListener, onEventMethod, eventObject);
         }
-- 
cgit v1.2.3


From 0508a41afddce1b81921a0eeb9e03f28d0f04742 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Sat, 14 Nov 2015 17:40:17 -0800
Subject: added ttl parameter to WirePacketSendFunction

---
 java/jni/com_zerotierone_sdk_Node.cpp       | 5 +++--
 java/src/com/zerotier/sdk/PacketSender.java | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'java')

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);
 }
-- 
cgit v1.2.3


From 399b2e9e26bc2f5bae2f78cb41d8e977aa327bc9 Mon Sep 17 00:00:00 2001
From: Grant Limberg <glimberg@gmail.com>
Date: Tue, 17 Nov 2015 19:16:10 -0800
Subject: forgot to submit this.  Add DeferredPackets.cpp to the android
 makefile

---
 java/jni/Android.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java')

diff --git a/java/jni/Android.mk b/java/jni/Android.mk
index 3da3b04b..5c2f1c79 100644
--- a/java/jni/Android.mk
+++ b/java/jni/Android.mk
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \
 	$(ZT1)/ext/http-parser/http_parser.c \
 	$(ZT1)/node/C25519.cpp \
 	$(ZT1)/node/CertificateOfMembership.cpp \
+	$(ZT1)/node/DeferredPackets.cpp \
 	$(ZT1)/node/Dictionary.cpp \
 	$(ZT1)/node/Identity.cpp \
 	$(ZT1)/node/IncomingPacket.cpp \
-- 
cgit v1.2.3