From ae7eb359a0fd6471066f5172bf182d7363d2f1ba Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Tue, 21 Jun 2016 16:26:38 -0700
Subject: [PATCH] Updated Android integration, added build instructions to
 make-mac

---
 integrations/Android/java/jni/Android.mk      | 120 +++++++++---------
 integrations/Android/proj/app/app.iml         |  11 ++
 integrations/Android/proj/app/build.gradle    |   4 +-
 .../one/service/ZeroTierOneService.java       |   2 +-
 integrations/Android/proj/build.gradle        |   2 +-
 .../build/intermediates/dex-cache/cache.xml   |  82 ++++++++++++
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 integrations/Android/proj/gradlew             |   0
 integrations/Android/proj/proj.iml            |   2 +-
 .../UserInterfaceState.xcuserstate            | Bin 50374 -> 50874 bytes
 make-mac.mk                                   |  45 ++++---
 src/SDK.h                                     |   2 +-
 src/SDK_ServiceSetup.cpp                      |   2 +-
 13 files changed, 192 insertions(+), 82 deletions(-)
 create mode 100644 integrations/Android/proj/build/intermediates/dex-cache/cache.xml
 mode change 100644 => 100755 integrations/Android/proj/gradlew

diff --git a/integrations/Android/java/jni/Android.mk b/integrations/Android/java/jni/Android.mk
index 638e029..859cb40 100644
--- a/integrations/Android/java/jni/Android.mk
+++ b/integrations/Android/java/jni/Android.mk
@@ -2,24 +2,28 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+ZTSDK := ../../../../src
+ZT := ../../../../zerotierone
+
 LOCAL_MODULE := ZeroTierOneJNI
 LOCAL_C_INCLUDES := $(ZT1)/include
 LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include
 LOCAL_C_INCLUDES += $(ZT1)/ext/lwip/src/include/ipv4
-LOCAL_C_INCLUDES += $(ZT1)/netcon
+LOCAL_C_INCLUDES += $(ZT1)/node
+LOCAL_C_INCLUDES += $(ZT1)/
 LOCAL_C_INCLUDES += $(ZT1)/service
 LOCAL_C_INCLUDES += $(ZT1)/osdep
-LOCAL_C_INCLUDES += $(ZT1)/node
+LOCAL_C_INCLUDES += $(ZTSDK)/src
 
 LOCAL_LDLIBS := -llog
 # LOCAL_CFLAGS := -g
 
 # Netcon files
 LOCAL_SRC_FILES := \
-	$(ZT1)/src/SDK_RPC.c \
-	$(ZT1)/src/SDK_Proxy.cpp \
-	$(ZT1)/src/SDK_ServiceSetup.cpp \
-	$(ZT1)/src/SDK_EthernetTap.cpp
+	$(ZTSDK)/SDK_RPC.c \
+	$(ZTSDK)/SDK_Proxy.cpp \
+	$(ZTSDK)/SDK_ServiceSetup.cpp \
+	$(ZTSDK)/SDK_EthernetTap.cpp
 
 # ZeroTierOne ext files
 LOCAL_SRC_FILES += \
@@ -39,70 +43,70 @@ LOCAL_SRC_FILES += \
 	$(ZT1)/node/IncomingPacket.cpp \
 	$(ZT1)/node/InetAddress.cpp \
 	$(ZT1)/node/Multicaster.cpp \
-	$(ZT1)/node/Network.cpp \
-	$(ZT1)/node/NetworkConfig.cpp \
-	$(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 \
-	$(ZT1)/node/SelfAwareness.cpp \
-	$(ZT1)/node/SHA512.cpp \
-	$(ZT1)/node/Switch.cpp \
-	$(ZT1)/node/Topology.cpp \
-	$(ZT1)/node/Utils.cpp \
-	$(ZT1)/osdep/Http.cpp \
-	$(ZT1)/osdep/OSUtils.cpp \
-	$(ZT1)/osdep/BackgroundResolver.cpp
+	$(ZT)/node/Network.cpp \
+	$(ZT)/node/NetworkConfig.cpp \
+	$(ZT)/node/Node.cpp \
+	$(ZT)/node/OutboundMulticast.cpp \
+	$(ZT)/node/Packet.cpp \
+	$(ZT)/node/Path.cpp \
+	$(ZT)/node/Peer.cpp \
+	$(ZT)/node/Poly1305.cpp \
+	$(ZT)/node/Salsa20.cpp \
+	$(ZT)/node/SelfAwareness.cpp \
+	$(ZT)/node/SHA512.cpp \
+	$(ZT)/node/Switch.cpp \
+	$(ZT)/node/Topology.cpp \
+	$(ZT)/node/Utils.cpp \
+	$(ZT)/osdep/Http.cpp \
+	$(ZT)/osdep/OSUtils.cpp \
+	$(ZT)/osdep/BackgroundResolver.cpp
 
 # lwIP api files
 LOCAL_SRC_FILES += \
-	$(ZT1)/ext/lwip/src/api/api_lib.c \
-	$(ZT1)/ext/lwip/src/api/api_msg.c \
-	$(ZT1)/ext/lwip/src/api/err.c \
-	$(ZT1)/ext/lwip/src/api/netbuf.c \
-	$(ZT1)/ext/lwip/src/api/netdb.c \
-	$(ZT1)/ext/lwip/src/api/netifapi.c \
-	$(ZT1)/ext/lwip/src/api/sockets.c \
-	$(ZT1)/ext/lwip/src/api/tcpip.c
+	$(ZT)/ext/lwip/src/api/api_lib.c \
+	$(ZT)/ext/lwip/src/api/api_msg.c \
+	$(ZT)/ext/lwip/src/api/err.c \
+	$(ZT)/ext/lwip/src/api/netbuf.c \
+	$(ZT)/ext/lwip/src/api/netdb.c \
+	$(ZT)/ext/lwip/src/api/netifapi.c \
+	$(ZT)/ext/lwip/src/api/sockets.c \
+	$(ZT)/ext/lwip/src/api/tcpip.c
 
 # lwIP core files
 LOCAL_SRC_FILES += \
-	$(ZT1)/ext/lwip/src/core/def.c \
-	$(ZT1)/ext/lwip/src/core/dhcp.c \
-	$(ZT1)/ext/lwip/src/core/dns.c \
-	$(ZT1)/ext/lwip/src/core/init.c \
-	$(ZT1)/ext/lwip/src/core/mem.c \
-	$(ZT1)/ext/lwip/src/core/memp.c \
-	$(ZT1)/ext/lwip/src/core/netif.c \
-	$(ZT1)/ext/lwip/src/core/pbuf.c \
-	$(ZT1)/ext/lwip/src/core/raw.c \
-	$(ZT1)/ext/lwip/src/core/stats.c \
-	$(ZT1)/ext/lwip/src/core/sys.c \
-	$(ZT1)/ext/lwip/src/core/tcp_in.c \
-	$(ZT1)/ext/lwip/src/core/tcp_out.c \
-	$(ZT1)/ext/lwip/src/core/tcp.c \
-	$(ZT1)/ext/lwip/src/core/timers.c \
-	$(ZT1)/ext/lwip/src/core/udp.c
+	$(ZT)/ext/lwip/src/core/def.c \
+	$(ZT)/ext/lwip/src/core/dhcp.c \
+	$(ZT)/ext/lwip/src/core/dns.c \
+	$(ZT)/ext/lwip/src/core/init.c \
+	$(ZT)/ext/lwip/src/core/mem.c \
+	$(ZT)/ext/lwip/src/core/memp.c \
+	$(ZT)/ext/lwip/src/core/netif.c \
+	$(ZT)/ext/lwip/src/core/pbuf.c \
+	$(ZT)/ext/lwip/src/core/raw.c \
+	$(ZT)/ext/lwip/src/core/stats.c \
+	$(ZT)/ext/lwip/src/core/sys.c \
+	$(ZT)/ext/lwip/src/core/tcp_in.c \
+	$(ZT)/ext/lwip/src/core/tcp_out.c \
+	$(ZT)/ext/lwip/src/core/tcp.c \
+	$(ZT)/ext/lwip/src/core/timers.c \
+	$(ZT)/ext/lwip/src/core/udp.c
 
 # lwIP core/ip4 files
 LOCAL_SRC_FILES += \
-	$(ZT1)/ext/lwip/src/core/ipv4/autoip.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/icmp.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/igmp.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/inet_chksum.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/inet.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/ip_addr.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/ip_frag.c \
-	$(ZT1)/ext/lwip/src/core/ipv4/ip.c \
+	$(ZT)/ext/lwip/src/core/ipv4/autoip.c \
+	$(ZT)/ext/lwip/src/core/ipv4/icmp.c \
+	$(ZT)/ext/lwip/src/core/ipv4/igmp.c \
+	$(ZT)/ext/lwip/src/core/ipv4/inet_chksum.c \
+	$(ZT)/ext/lwip/src/core/ipv4/inet.c \
+	$(ZT)/ext/lwip/src/core/ipv4/ip_addr.c \
+	$(ZT)/ext/lwip/src/core/ipv4/ip_frag.c \
+	$(ZT)/ext/lwip/src/core/ipv4/ip.c \
 
 # lwIP netif files
 LOCAL_SRC_FILES += \
-	$(ZT1)/ext/lwip/src/netif/etharp.c \
-	$(ZT1)/ext/lwip/src/netif/ethernetif.c \
-	$(ZT1)/ext/lwip/src/netif/slipif.c
+	$(ZT)/ext/lwip/src/netif/etharp.c \
+	$(ZT)/ext/lwip/src/netif/ethernetif.c \
+	$(ZT)/ext/lwip/src/netif/slipif.c
 
 # JNI Files
 LOCAL_SRC_FILES += \
diff --git a/integrations/Android/proj/app/app.iml b/integrations/Android/proj/app/app.iml
index 849ac37..ee8e8ab 100644
--- a/integrations/Android/proj/app/app.iml
+++ b/integrations/Android/proj/app/app.iml
@@ -51,6 +51,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -58,12 +59,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -71,6 +74,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -78,16 +82,23 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/8.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
diff --git a/integrations/Android/proj/app/build.gradle b/integrations/Android/proj/app/build.gradle
index 0716500..5f63419 100644
--- a/integrations/Android/proj/app/build.gradle
+++ b/integrations/Android/proj/app/build.gradle
@@ -29,9 +29,9 @@ android {
     }
     task ndkBuild(type: Exec) {
         if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build.cmd", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../.."
+            commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build.cmd", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../../../zerotierone"
         } else {
-            commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../.."
+            commandLine "${android.getNdkDirectory().getAbsolutePath()}/ndk-build", '-j8', '-C', file('../../java').absolutePath, "ZT1=${System.getProperty('user.dir')}/../../../zerotierone"
         }
     }
     tasks.withType(JavaCompile) {
diff --git a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java b/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java
index bc64530..5aa1aa7 100644
--- a/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java
+++ b/integrations/Android/proj/app/src/main/java/com/zerotier/one/service/ZeroTierOneService.java
@@ -93,7 +93,7 @@ public class ZeroTierOneService extends VpnService implements Runnable, EventLis
         networkConfigs = new HashMap<>();
         eventBus.register(this);
 
-        Netcon.NetconWrapper wrapper = new Netcon.NetconWrapper();
+        Netcon.ZT_SDK_Wrapper wrapper = new Netcon.ZT_SDK_Wrapper();
 
 
         wrapper.startOneService();
diff --git a/integrations/Android/proj/build.gradle b/integrations/Android/proj/build.gradle
index 2174a6b..1f0a3fa 100644
--- a/integrations/Android/proj/build.gradle
+++ b/integrations/Android/proj/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.google.gms:google-services:1.3.0-beta1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/integrations/Android/proj/build/intermediates/dex-cache/cache.xml b/integrations/Android/proj/build/intermediates/dex-cache/cache.xml
new file mode 100644
index 0000000..9223a95
--- /dev/null
+++ b/integrations/Android/proj/build/intermediates/dex-cache/cache.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<items version="2" >
+
+    <item
+        jar="/Users/Joseph/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.1.1/support-annotations-23.1.1.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="8d680ba5a623724d1fb0e81c36a790f023a6cede">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/support-annotations-23.1.1_5cd68cc6b46a0de049ec386f6fc8f298bcd71a7e.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-xml/1.1.0/497f05ee745c564e0ab5c26e66e60d4f7502fba3/seamless-xml-1.1.0.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="497f05ee745c564e0ab5c26e66e60d4f7502fba3">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/seamless-xml-1.1.0_00683e56f276d4b9aa45aaa32685df47934f6efa.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="5c5699834e9722f1c288fea2de82725d078ba127">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-23.1.1_7653a763c9af67633aacdc184e44e140f5800db8.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="6cbc7773921fcfedbe55657578f0cbfe614778dc">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-23.1.1_0db787dd170345a92125bb6cf144106af3cc06e4.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/.gradle/caches/modules-2/files-2.1/org.fourthline.cling/cling-core/2.0.1/c588b1493c6f92f3e63755c9b763c740546f805a/cling-core-2.0.1.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="c588b1493c6f92f3e63755c9b763c740546f805a">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/cling-core-2.0.1_3d6d4fc4f66ed0419e6d579c1348a3e87b356737.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars/libs/internal_impl-23.1.1.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="a4de9c81ae239414e1ed0f86441b02abaf29bca9">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/internal_impl-23.1.1_abf6348ef937a1c6eb5243b2bc3633b3e86e9535.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="8e673cdfadd8f2d98fdb2fda2285c30f6e449782">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-basement-8.4.0_a313548ef3e16fe20e70b2073d296a32645461f6.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/.gradle/caches/modules-2/files-2.1/de.greenrobot/eventbus/2.4.0/ddd166d01b3158d1c00576d29f7ed15c030df719/eventbus-2.4.0.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="ddd166d01b3158d1c00576d29f7ed15c030df719">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/eventbus-2.4.0_7fa1640dad5da17d111c46b3fec36ec577cb4960.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-http/1.1.0/463012d16bcb06a623d3b931a6cfe19e4beace63/seamless-http-1.1.0.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="463012d16bcb06a623d3b931a6cfe19e4beace63">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/seamless-http-1.1.0_a627c0b0e27b63cd8ed30af446e75334e202210d.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/8.4.0/jars/classes.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="1c9f35e952b212c843f7bd2c7eec8e82ad95602e">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/com.google.android.gms-play-services-analytics-8.4.0_3c7a528abcac3ea4d733a4b470f52391191d9c14.jar" />
+    </item>
+    <item
+        jar="/Users/Joseph/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-util/1.1.0/ef025cdbb79c4a031148b20a6d59db89c72ea0a3/seamless-util-1.1.0.jar"
+        jumboMode="false"
+        revision="23.0.2"
+        sha1="ef025cdbb79c4a031148b20a6d59db89c72ea0a3">
+        <dex dex="/Users/Joseph/code/zerotiersdk/integrations/Android/proj/app/build/intermediates/pre-dexed/debug/seamless-util-1.1.0_d3e7df7d059ce15b3af16dcec99c97708966d01f.jar" />
+    </item>
+
+</items>
diff --git a/integrations/Android/proj/gradle/wrapper/gradle-wrapper.properties b/integrations/Android/proj/gradle/wrapper/gradle-wrapper.properties
index fd27bdf..d570517 100644
--- a/integrations/Android/proj/gradle/wrapper/gradle-wrapper.properties
+++ b/integrations/Android/proj/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/integrations/Android/proj/gradlew b/integrations/Android/proj/gradlew
old mode 100644
new mode 100755
diff --git a/integrations/Android/proj/proj.iml b/integrations/Android/proj/proj.iml
index 16853d9..2c2e416 100644
--- a/integrations/Android/proj/proj.iml
+++ b/integrations/Android/proj/proj.iml
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file
diff --git a/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/Apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate
index cb1d0ed1afe7d8a74036eb9b682552c1da9d9cb2..63bfc4a8efdeef49db15b06c4a49e9b954438782 100644
GIT binary patch
delta 15049
zcmZ`<2S8KT*AMS0c@x4?6ZYO)rXb=*h66-JA?zVLfe_})4Ion)j}cbb1gNuG_ukcN
z9j&Xat+TGGt=6iw`n`ao?bm;RBzOJJxo6*ZIbH?tUJKVxg1;fZZQxp~e7$AX9hkCW
zTeEH0wro4LJ==lp$ezabVf(VDvlp-f*+J}J_6l|cdnJ1nJDHurUd>Kr=ds1?e0Di|
z4ZDI}$!=mdvs>7G?0)tDdyqZER<MWJBkV8O+u1wVJK4L~yV-l#C)g+1U$RfJFR?GP
zuduJO@38N(e`eofKWG2WenBA+0wWWUiHHWGiD)5)h!J9pm>>>_BjSWOBfiLV#1EN)
z1R=pl2(l1KN3szCB0}<zLZk?hAOI;x)*#hL4N`~HBTYy%(uTAna-<vSM+T5#WCYoO
zY(%ypUm&}XL&#y|1acZVhg?FgAwMCvko(B8Uyx_WE95T}Mkk;cs)lN#Iw%h{Kuu69
z)DCq)T~T+`2c3b=MT5{qXgInGjYbpE)o3~@MDx&Mv=psC*P=Aqiguy>r~=)9Zbi4D
zU(m%9b*W3}WAr!l8TtqM5`BaIg{fc=ri!sK93wCerh(~TlQ15piy2}@m=$J?*<iMq
z9X1tn!`!jy*j#KLwh&u{Eyh-05m+o1hoxddEC<WQim?)`605?hu^NoVx-dD`jrCx?
zSRdApZNN5So3PE;Zfp;Q?Zx(CC$N*)m)KX>_t+2Eb?is%C+s%%Gj<QVk3GO1V}D}r
za27rRpNOM4hO6P~xG`>mo8o4;Ic|Yl;#RmdZjaBxXXA75x%fPMJ|2KCzyt9hJQxqf
zm*dfR3?7Te;qiDHo{s0^1$ZG|gcsv$@pU*=hu7l`cq2~ZZFoE0gZJWF@oo4Q_;!2;
zz7yYtAHa{`NAXkmIs6j-J^lm!JN^Ry1AmFX!e8Tm;&1T3@VEFo0wUN1PN)%D#1ul0
zFeFR}E5e$vCme{`#2jKSF^`x}1P}{|Kq80;CKeH)L^!d6SVhEAL^6>@WD^3SfG8x2
zh%%y_SVMFYU4)$ICVGfoqL1h&28co8Gh#jQIkA=4N9-pK5C@5)#3kY~afP@_TqC|C
zz9)Vlt`iT4hr}b|7vc}%CGnP=Ku#o8NsLq@HAyXUGC76RBaKL7(wwv=ZAf?0gY+bW
zy-06zE;)~!PX>?+$VKF0av8abj3*PwL^6ZSB(umIvVbfkC1fR8MOKrIBuzGvo#YU?
zp8TBLPVOf6lLyEn<Vo@?@*I7dJspB!8b``GZ2;;7&?tZ|1LzfiUT^I|a21vLTi2tB
zk>0-ol~+LJF94|kXd-}601*J<07wf!x&Sf(kOhEj0OSB5X8^eY$P++50Ga`y*;|8>
zLQz^<Fez1=t)u#sJsGGx1}aa0%59+XRAOf8zmNO)VC}sJD+}G7T<naTU7fv(R}?zC
zx;WVxITc@Ip)8Drv-Q~~EUN*w0o#ym#5M*hzX6qJK;=15`F((G$~I$gEr7}kpz_BU
z?n~M^r<ktKHi4bkZnTDgJHwsr!OZajDzAacpJQ|0jMIK-U0Zp4RiU$!m%E*ji<`Uq
z7;z`2@rk$}d$tn9XAXNV12P||yag)nlpqjm9OO=KX<XEbLWW}(4=2~+<%P~3%vL@D
zgs?-E09s+}r3}C_06_qP#{eeK%>o-Zk{vrX9><Pn#uEXg3Ly5_I6^-bSi@=TY~?s9
zU<*~BvVH>)1|XcCAvAF;U{n87E)q6i&`JSB0!VEPO`UEKTEbQAbz^9C?D}yu4FGA<
zH-yHHt?W)EnvC7XZfAD@NE<*p0Gb4#$ph>zwwyuh0niixamUbjjFkJWN7<W{Yd&MI
zXK!F{1dtwp^Z{f5Aj1LnX7-kG3Pu1jrX4b+G?hCA-pf9ur0;i_eS|?g1|U-anT;Wu
zkBjrwq9d5^%0dq}Mxd@vUQ?ASar>t|oMxX>Vo>MV7Z{9h0AvXut1%4g_bM5h-t^h3
zLN6ybPX@%p$)z}gX?VIZ4fl^$b&dVw|CHWO>>CX7Edbd9$ZibTehgX5?BJq(Dr3ra
zol4h=bgb{QAOBC3C+w%=5^w~N6Maf#;`j&q&HtSJ7yGU1Q-lQ|7XZ1A(VR-_=2=*)
zBKZGWgAfQgPQe{O9`x!w6Gv@?`#)#%5M71>qaZH;d5=+;M(@e9fK3rAMxIkB#2T?-
zCfEVU7eLd;CiuM<=*{2OhK<{}r-$2^N<3ZvX5@$q;_*MpdLmv7>NEiP18C+L>Z~zT
zO|IVQ4rm<J&24HiT`1Oc^hf6YPoR0od<JL%faU;b?ikQKdau|<brBN9vf4mD7EiH3
zA^{Wtpg;fx185<D76T|0KuZC{_}vNstppG=fe)aV4YX7K6h9;tKyd(K-ZKFt0FVek
z#Q>55s2o6*09p&6dH~S?YLS>-WCgNtRuC(g6@p|*SQ5rD7SQX9-RV8~IFdWw5k#NO
z_eToG8zJ=M0)K=WZ!Dr4C=bm~2xa5lOXv}1PStoLjD9I`*ZLcob>scv^t3{MgdT4!
zr^}dzY`hUcpJ5tZ<Be7Hq#}Q$Z@dvj^O=TXyb(<gGmZ7*jad5EB43S7$QG7WFR~dx
z@x93B07{_!ip>JHvr>DJ9RNy{7<|jZRkV@aDmus>WG^dN^%ZgeImqX562w_C8S!C)
zm<(Z@ASEkjMM_3|f_PC(PBMU2OIQeik^q#<2*v|Hf*fVx69IAzIZi(=wslImz*@oz
zMNT4Lt_%qc_^_-GImHV9d&l^!uaGlzK#4AV7WtY^D)FMuBNsn0%(#4-#O#7HIUtvn
zJYNA&`hW49i~RV3tsnqpTtq(bbOSlgVJsx&eTqSDBX>W+{|un45AY9^@DBk6W&am`
z0dnvIeh9Pe4`|Pk7oX7n0Fdwl+G{1+p8(4F4=_~a6Id<-#^<<*?Zt7K@d@^6nY5g8
znllk)e}qLDN$0(XMR5ieWpc9kzhE^{CQpy6CLcfrjK#TA$PsiB3r8oTQ;_3)j{4u!
zF*_zFhQnm2LPj_jP+ew{9;&}AB-A0E8JHQuQ~*U|3PKH0qsWlZ;M|;;*t7)Ys(z-+
zm=zu#5~^&y7X@mHnt$S%sS`?+JUcOpL#>reGi3wyUralpOerzWv;;ta@eB{@z3$Md
zjP4lM{-8V51NHhu!W%%PAH?FTq%a*oW&c3|S@+2_!j+~mUTdK9(11^1OsHA&0W6qO
zqA^;o_%Ag2lkS#(G6ZxPy5bXB1c0hOphYUdq5xF=Utlsc;lt*cH8qUYDz!zSNoX>&
zbr?XkAC;4e>d%_TQflSH1~SmBPb9MewC)4R93@G{u<HJcWY;JDSN)Cu5>)aLj6wl`
z8a|+vDbbiH+4x^*eV@>nJ$`TtbRAm%5e;nsP}2vnCM8%ifSUgcOz|F!Vk|!TZ)kF~
z=M!2lfLcGG4JgqD0VMk`wDq4@i~SqeMszbvvlrb2p!QyL3xGN#{*eK*=Y+(hCxqq*
zQZkbG9D20WD0Dk|fTcN%?m%~<yU^X}9&|6d58V%-E&#~^)D55>05QDu0jM891H<S+
zmXYdH^ay$sJ%%1<83AZeLXKswApj`=Gz_2-TEFZ$bs4?MvKmFNpjXjr=y&M%=nv?1
z^hfk3^ag-F1JDKlF|09sZ3WO50AfP)E&%NT(7sXh7J3`KgWg4dM(?5b(Ff>5^bvp#
z0O%-yP5|g6fKCDE41m4{(0Kq|0MNJpNM-1+V_9J$w4Tp#qhm5G=$|SO`iCS<6n!zC
zFE-Lq8P-g%HZM6V>u*UA{d0VLGoLf<<HC}ZDJaGoANZVBPn}0#6USTI_?$V+G*7xB
znVEu(cW$S<Q~Xg(eY~}k=BG}lBP!Gp?eUJ?bausbggf5Y`<@R|++e(8KcD0Ak+4st
zhORMY#?tJ=OfXXb9R$#!KFl0rBF<p|9ifvet#$1&r+<w*V@$1e3_!=}^_6-V9+>z4
z8khLLcQ4EjoB97H%^m~!QsQqqV-1I;e0`Wb9}85@4#1d5avDHi^<ke#YE(@QSb{D6
ze`rjl!mxB!iB`7xA80GFsQ-t?cmy;19GzXIMa5%D|8M;L20v{e4a@u&$t)}zKo<e@
zjgn;JgfWt)GnnE-`TDRE5tje2WzHCrBN*D3l*`t=WU-w7Hl4ysSyug+1Ou29KumhR
z3ZQHKSQ%E1tpU(?0AjM@OWL(MGpLr8JBY2t)?sy6J=OrA?*ViRKuijL2%skt;}7(k
zFqsmt8Ee5>0rUfat^?@Deyj~^$2tJ?6Mz^;xk*2+-a-vv!~ZpN1RKQ|Ph!q(cK~#k
zDL`i^x5vB|8!ergo01m)fzlT2i~m}`9ovEJ1kgPI-3QPE<@#||vzB-p@i~(t5(JrH
zDG7p5+MssQjQ!Z*|H3$e9mN=lF%J3*fF3g#eox1Fh+`R<LoB1Qgo~X*^|$8KCP8yQ
z#B}To_6^Hwh}rzt*g32fyMQs;Vnpy1K)*6l0MKs$dNzc$srX`-u`4RRD!xjIsN?|X
zIe=c!#&yGUZm@9dCU#4i$a7NC6O;$<AJ~&(M*;NvSUSh<V0XtecS0X_hZW9LdSRLI
zG5JO@IY!Rjt{z5<f;kW9$I*t7*h5xsFH21VON_?~Fzg8{cNBYy{i-@2d#1WXH9$24
zy@tJ14Fb@g0Qw84Fu{sBFP{b~yMW3OWgLT5fXV@-W<Qq0*xPZJe)B#8sG&GK-t+cD
z^qKt6=z}9;<1mW}5xyu+j<+Bt<V+75duV`j@F^@S1+IZ>;##;iu7gj)Cj)o_fF}Z2
z6~Jr&BLGGLj45y~&ck(CYPgm%SOXXbFacmv0y7i0&Tg<&p=_9pf@?8NiNSj-!5wf<
zmemOEh&$oVxC`!zPsQDEciaQOY5-OTFbBXI0M-OBvrHSnIsl$DqT<Oi!l&UrxGz3k
z^(j6B_m{*o=>TT<ngU>B04FI^1Dp+Dfy9i@ndC1NrU-LlGUx}5=T)@n8>y2PkMAu6
zU&N$7)?tZvFTNPS-1nIe4`b!_;Y;yw0P_HB_|bXr75FN~dGQE*C4hAStk;J};!yzB
z2e1Kc*yI+OfG7XI@zrDFMoQ=Q9XHYsThG9S%n=RG#Ix{hTmWDb0Gk5X48Z0Ccn+S6
zi|{-ETL5?lfR_PyIlZN+Y*q<g&R8%`;SwC+QoIx|1F$84tpIEdU>gA20@!W{UxQbu
zGDl{-8m|GcJ%Bxx@=%Jz8^F_Oaq~8fCcK5o(|9w09eVLr06WsYEqWRqco!oNyc57q
zy|^5}&h+XQgWx`VRA~YI_y9hL58(=Yn29~G3xHh#JQcuh0Coqk2NQ>sbN==-Hiwz^
zk6-%RmJo{%64;IJ{lvvS0DFB5ulPay5FOWQK^?<Se426+z&@X*oW{?5;`S_neU%w`
zT(ReI<tYbOFs$|B-vD^}r=iRERprnX0Q>dg{S0?X6VVEt9mt=Plbj&PNXQ9`$#NL;
z5(X=Uh2z)p`%F!N|A_yD-@tF;xA5Ee9sDl-Gky=i{s5i{;8_5k4d6Kdo(tf40G<!v
z001u-#UH46;*XfW$M_Q!&oQfg2H-$RJb;6hZ;JrDgt6Q)+YQ^AA<I<pCRogQaSoxf
zDkOACOh!_|tjyeu8~_K61s4J)Ch$2LA5RNoXTQ*doPJ^=p-N9~H?boS7EYi9wmc+s
zyxanC2!Iz}U_b*^f(TNQv}hbjo#4=w?RpdY2@OJ%Uei96BD9&MEJBBvL`<FtCW45N
z(4fq?n4FZ%3<fPIAtNa#nZr2z;&A{j!DD88;GmDtWrhE(ePN6deF6h;=-=oYGxXo9
zh%hD08O0K20AAWlFy#dt&X}MsLf8<tEUTU##@fw4oJ<Huf;pLt5Kee0;X=3)QwcZ1
zo$w$$0lZ?&<Rbvgc;qSoM*^7fM?Qd~M^v8@(+D5Jm-+M~W-#w#k4)eg0LKD2Zp<4P
z6(o#(Nu(cjY^8Jxl@A}CitUUFUEI8wr>HJouEoV;!I=nQ33?<Z<KGwm?K=}Gdfo?c
zV%gvNBgVde*lQ%gXKZdP&JfW6PL_<HxrsPdZa)!EBoK)JPGMX(4ZxWnqYaTlr2R9R
z5a~n)fSG`jN-yZL&=nG*e~sr6VgRQDID@X~GIlK{B>x%*%Jo^ydWk=in3%eJX--O7
zN={0G&|i=c!{=Dhhbk;6hYtr0qJn5p%Ds}PBC3fRqLx@otRw1(dH@Rn%$Q{^fJFdi
zq7*|mAHW3wE>y~$W*I5XooFRwL>tjQCgLIqsWf!}4*+;4fOi4-u+s53p~;zfvlC)-
zladky<4n+Xa)rha!4x081mnQPy~GHBOXzvsF0(ff%wy7CVk3a5USczVB@(l+;Fy#T
zhfZP}v6H3QPkcdaCw2fB09Xp((tctW!^<83mnq5j(fhjNqYp8Oh&T-3@{fs#I7Tqh
zL_r)UP7o)FFNsscY2qsYGl8xGz?A^50&q2enQ&UGAkGqB6X%HY%+E!F2`*~^ybi#P
z0B#xk?E!Ev4SE{QxmmffX(@3IarRkhxx(=`VP>u%F5!b+{7BrU9eTO*?htnwu`%JK
z4#4$e;%Z>>1yfrv4{?v8|NRj6TjDYCgmKxY#IM9}#53YK@jJb)cPYjM?<N3u1DK|N
z>Gk$|#Y*ibUK4*3Zvf0h`!)c#GkYf9kxZZ=&XW)cM+C$tWaOkIGDX+YF@GN01(OqG
ze2y|%YU3Pq%;!lqiO?B+Mi7b8^?jyRV;HzX#gk+*yt`7kviHEG`gmu@SSS5fp{qt}
zlRB(m0CxdcE@3I_6Cy4vYaEwL@@TSuGDPaq7X1dWK50PD>$g`iq;vbjP5)NjklN$r
zN!OSkk`{~-NlO6t)7Sb<9c)P_CYzFWq&?|CIs$kQz(W9L3}|?ObS7OGhNc3Tv80Vk
zo;K6A12cHj$QjBdKBO->o%93nD1bi$@Ol7mpvwnnJdg}#tc?r;@Fv=H&@^xf8TP@8
z$)y0^^4^Qd<xI6et{|Bp^f`dP_~^f6BpLlr|082aCiZLv@HV<(P)|3BT>Y={RFa7R
z+X1|TJ~^mwl1&Pfk?>>cB6G<+B}0tM?d~NRm)k?jIl5_Nk&=EfSpwj_03Is{$C4lk
z$g+Romy?V=GkJEu#D4|j{d3||axw*`Gg6|*3X}I%N!F0-{<W@-WL*9rfDh5@h78r4
z$riGeg_AN?FxgIa(0hl1j802f06qfXvzN#&QqBx^lRacFGeJfUOa$a0ZKYUDod)n3
z03ZFE<&p|=SZTQ`o&Y`t;A7*4D~TUh@CL?q$&KVDl5zFp06qcWlmD{akEZ(G@c!Ex
z_l#Sk>X#qQG31}-_z$MZqYT>vDsx!DDojTIO1ZH!64p3JUn)(mo!P0xVBB=ikZ1WE
zOBytAX~{50<!icO*abdMUZ8&+wt)M{i}aIWANUe^nRXbNOx<8^*PpZBAZ$d9xlq?Z
zCL?-?0duKtig+V2NCv_@nL$dKYx4@Ein%sl%UqoIAbrebxdItwF3UF~TaoR^PULIk
z5%LP<piXEUnv2$>4XB*C-5x<dV{W)NG0#(WGtW{Epof`9C6AfA>%~|hb0fW$ITbcg
z%$ZNdobx)d5o`-{|9k*DgdM>>nEE*o4`Yg2KAy}}oq5b%aUuSYx$J#Ms4x}BM1o+h
zcsYb7q0OY-a3Y_O5~a+2?K+}`=wR+>6~qX0OS_E;x;vQr*{_-V*&mtP*k{Bm=KfWe
z@jOp*4!MMJkCh}9N%EQd)nsxtna13*)-gA!7s*HD@8nDJHTgzuqME82qNbz9Q`1v3
zP%~9CSF=*HQS(sqQk$mct2U~(Lv5GZ9<_bymg-a0{nclw&rzSJ9-tnm9;_arzDhkx
zJz70hJwZKLeYJYK`Z4uq923qG4&ZcgMmZZen>e3ywo#nzoKu{OoGYAbobNf;IS)Bc
zIlpn9b6#=&<ov~Xr$K5MY0TCL)(F>FsgbOau92ycts&A7YZPb{X%uU$(V#VYH2O3K
zG=?;WHAXeoYwXh4qp?rpfW{$>BO1pvPH5cJ<Y?Mz&ee?3tk!JRlxenUc4!W04r(ei
zw`qQ%xm}amsd-HExaJAXFEuY|Ue>&#c}??%<^#=NG@oexss(8gT9dR)w9K?Dw5+sj
zwc51$v^HsN*V?JITWhb@5v^ldC$zrQI<0j<>#EjUZJzd2ZC~vf+B3ChYcJN0(vH@S
z)sELr)K1o3t(~WxuU)8JtW9YH?K15(+C$ohweRbw>$n-{MCh#2Nzh5wS*??%ldD7N
z0G*vWhjcFLT+_Lw^Jwey&vaENBd!V8jBCNQ;@WWSxDH$=t_yc6*MsZL_2tgs&f?DH
z25^J83%N_UOS#LrE4fkJ7;Zc_iMyJc&duTqxgu^pw}?w|rQC9ECAWsVj@!U(;<j?z
zxn0~IZa;U3JHlPh-NgNz`vrF=cMo?z_Yn6e_XPJ8_YC(O_aeo;#J$S>p8F&BCif2a
z9`_;lG51&QbM7D9*WAB&EFR2L<)J)+r_R&l>F}oTba@6mW1bn$l4rxS=Q;6QdG0(f
zo)6EDH<LGqH=h^C3*jy1h4Gg0B6yL!XkHvIk(a_t<7M&$yj-4`SI8^j0bUuef>+I3
z%d6*6jl2$C7w-V?B<~dOChsBd7hSe4M^{tVQ`cX2mTrvhYTY#57Ts>$UfpxLS9QPB
zQ_;ip2)!A40eXRY`Fc{lGQA$X5xvj!PUxM}yP)@4AJ(6!Z=vs~@2tO2f4P2yeyx79
zeyjc={Zsm18K@gfG2j^l8iW~y8`Kyy8MGMeq6`ij95r}k@VmhuhPsAkh8BiP4WkUB
z4J!=m4I2%28Xht{V)%pMUBi1uY$J}5rjfIew~>!ggi)MPf>FIun^A|+0i%;fr;L6v
zdSUd^*x1;{*v>e>c!_bCakg=RaglMC@sRPb@d4wL#;1($8b2}q)r4zeVq#_zWU|y`
znMs8SRd3R0ve9IR$u5(tCO1uPo8qS0rjtyaO}$NhOe0L=OcPA&Ol79+rUy;GG(Bzl
z-1INgcV=d0_GXS|;bwfZ7&FSO(yZES#O!mkZDtqDzBBv5?5#Q595pvJw=;Jz4>#wV
z$C#Iz*P5?0-)O$We3$tx^GD{7E%YrcEUYXRScFm*OD*y(q!wisLl&DXwpg67IA?Le
z;-STJix-xLmR6QFmNP8_ErTuNEz>PCE!SDLTDDnkwcKmD-|{=l+m?5&)T}03ajjge
zrdjz~MOh_TrC9Y_t+(1}^{v%)tDmeVTB})etlg}qThFkLw@$atw63>qv+l6|!g{~;
zLF?PrzgSaGY;YTGn@KkAHhwn#Hc>W7HYql1ZCY$(Hrs6W*&ML>$>zSzLt8CdJzE3Y
zg|^FWBW&|*CAL!ALEDYCn{Ch8UbX$s4z<&?)3)=p^S7I27iX7dmtj|9*JRgXcf#(R
z-37as_A2(U{ZxBjdq4XG`waUm`?dBh_A>iD_DAiHQ}$2nU)sNRFmteXaC8WBh;-mP
zR5;W-G&*c^*ynJ-;hMuOhdYjhqmJWb#~F?Rj)9IMN6Ha6_BxI_u6MlT_@m<uC)7#P
zN!!WGX{OU`r`1kEr(CC2ryi$1ryEWWoE|ybI!|?WcV6lo<s9u??Myp2JAdZ9&3U`?
zL+9ttFI*^n7Yi3FmjIU~E@3W3F6Ay2E~746UA}O+;&Q{~mg@vp(pBBn)z!y!x@(=Q
z%(dP1d)GUzKToxu>N0ieRN>U3sU=glPdza8klO?|(oNkh%q`N5@7Chh?bhpd+wB*(
zC+<_-eck=sfqS)kt@|$b!|q4jUwgnF6FsJT%<~BFSW9`dc*s0Xd0h1P)|2DO_0;u@
z@Qm|J@ND<&_Z;-R=lQGWGcOx2S1&iO9Is+8%4?_BA+IA|uf1XKiQZn`Grebf=X*=N
z%e=RG@AcmA{n+~t?^n~@r}<6upC+7EG_7RXk!fE|JL{w6qvvDbv)m`fC(ftQr^Bbq
z=d#aFJ~w^2zLbftneSrX2;Wt{oxX#<3g5fFPkeu!ZZX|)y7Tmm>3P%hr*EFVYx*9)
zDSpO&rhdtO*?vO5O@2H5cKf}Yp)v!W5in!PjIbH4GkRw9&A2t=(TvCbPX1p0)BMH$
zz`xZ0vj0#1H)op9beQQhGihelOu@`;GxyCrFpHcuY1WikDYFFBteja#W_>m5>}-wM
zyxDrQQ)lPQ7R}x|d++T1b5!T3&(W9@IVW*W@|^8+4$L_;7oDp)S9|Wtx$$!o=kAz$
zaPHxG+<7MR%;pu$E1g$9@65bQ^RCP{nQuGaety~fwe#!dU!VW;{QCiJ0n-C!1e67=
z4X6va9`JL({RMUl+!lB&Sht{c0oAtPuRzs6BrrKJJ5U&SB=D=ivq4jWjDt*rQi23Q
zIYIk^jt89#RtugS%ne=@oDiH8yfJu3@UGxDArnK`A;BTxA<IL$LWV+yLmq}a4|%b0
z+QQij=Ps;UC|lUR@an>w3vVxSTI988+M=pOjf<KVJy`T?(eH}`7l$nlUp%mQ!{SZU
zl8H;ymT;CtEQwo^uw=uM?Mrqpc^k?OMML95(?c^uPlTQey%1&-<{IV}Ruk3~))ICq
z>|)rrOYx=JOD8Q|x-@EO^wQ6l?peBT>0jZh;Yj$x@a5qV;oafG;iKWNmO;xVEDKu}
zxs1Q8eOdpq!DZhsyR+=)<#x;6mU}FxmRByXUQT_#{Lb>9S2(ZmUg5K%bVcoobt|r}
zxVhqXgk6MNghzxlq9$T(#19d7Bkrx7y3%*0-^%ut{VNAo{<&(xD%DjhR>iK0U$t%3
zzEuYzH6nSDdXedonUUg1S!8$Qfyi$oZ${pVyd8Nr3W`#Xni8cOWe{Z?Wfo;0<rL)_
z<sRh~H7zQUifWEJ8ugs7!k@rr^D#cjSLd7Z?fB08seBK<7k@54kRQTd%n#?U;IHCG
z@zeMezn{OJzl*=0e~5pS|0Vx4|1AF;|0@4?{@ZAk=n2uP(UYTj(fZLw(WcRBqg$f;
zqer9HM{kVY61_8ePxSuiL(xZ~@5M}rF^I8@v5BGVV;p0AVgh1<Viv|MiCG%6JZ5D~
za!hJWMod<WASO2^FD5@m9<w{<Ml3tlJ~lWuJa$Fws@SO5q}Y_$p4gGtuVTNBy%76t
z?3LK>Vz0;Eh`k;AbL@lIUt*ueK8t-3`zrQL?AthY92(~o=M^_CZfRUpTy$JTTzy<)
z+@83jamT5+J8_TWp2lPGTJbvZF7eaied812Gvc%2tK;eT=J+k~yW{u9Ux~jFe=9*d
zK|jGTAv}Sf5R=f8Fp}_D!tI1#5}qWQCORd$Cb}njCHf>zPmD`UNfae25=Rp^ByLXJ
znz%i2SK{8p1Br(dk0qW=Je_zp@qFSpiI)?vCH|23QzCUM@owV%#79Z`Nk&PgNft@g
zNp?w&NiIolNuEj5lBOs5C(TZpm$V=$IB8K*Xi|96ilkLZ{G`~V_@wM4VN!0AIB8?j
zo}_(A2a*may-sE)qse%(T5?G8%H+soesXN`X!4HaUCDcr_b0zi!BfZ-^%TvNg(<62
zqEez$;!=94l#MByQ$A1mBIRMq%aqqCZ&Kc^_E<f8_1x9-R|l?Mx4L6>*Xr)oeW@C$
z2B}7=CaLDBF{v4;S*e25+|=!<M^cZao=82FhNn$Q<E81P8K$jBOH4~nTb-7kwk2(U
z+QGELX~)uubZ)wCx_-J*dP=$|U7TK!UYve7{p<Ae=@-+fOBuWj%M9xb+YE<{=#2D?
z%#7@eoQ!Q5hcb?29LqSFsg-GzX`N}8>6qz~>6SS?(?4@|=Df^+%)rdV%(a;vnMX3e
z%Dj|$IrDbrFPTp>pJl$te3b=dP0T{F@GP|~PL^%flC0>g%B+U0t}I2?wyb?w2eXc3
z9nbnQ>q6GISy!m6@3O9E{gib->-Vg8*+jNZ_LOYhY=dm$Y@2NRY^QA3Z1-%>?9l9j
z?8@xT*}JljWS_~tmVGPxZub4`N7+xZUuOTA{Z^nNm>^IUs0;K276Mm+kHAkbQ!qy`
zU$9sZCRiqj5JU?2f@Fa}P$;MrGzgjmt%7zzmtaURBB0g_HVHl#Y!mDgoDzH^xFL8T
z_(kwk@J#SR@J<K`CkhcEE+mDMgeF2ep_g!`aE@@kFi;pGTqcYVMhc^avBG#^x-d^z
zCR{757t+EOVVkf|I4B$zekR-~+$`KBJR&?Jye7OQyeqsfd?b7#d@1}>_%=r+2hN$8
zqekUS&N0ie&vD9e&2i81%9)unCue?6U`|NRqMX#6#+;s<lR4*euIJp(d6Dxj7s{QO
zi{#?D+PRZ+dAa(zhPlSMKDlwZ*|}}GeYxv%cjX?=J(hbi_jK;r+{?Mwa(~GEDfd?H
zo!rN{uSF9?8X}%ZUt}aQ6<LTJMJ^&Yk*A27Ch`@{6@`kTM5&@2QJ$zkR4kH+szkM-
zI#HvjS=1`(5siwri4KWQiOz`5i7tvRiGCE_6x|Ws6Fm?;68$cEmq+C3<W0%b%`?a|
z&a=t0&vVLi&2!K5%=6C+%nQql$y=S5o|ly;%oF8NdD6V{yvn@lyxP3xyzad9RNfbP
zJM;GB?aw=ucPj5p-nqPsd6)98<lV@7nD<<)BF4m|m?PE_PZAr7O~mG6E3qx}&pqzq
z8R7-vW#VXYoH$XOB2E+MipAnWafuj+OU1R~7IBYwgLu1mmw2!EfcUWZwD_#}y!adO
zW${(<P4N@)t9;db<9xGx%Y4cv-#*_d-!<Po-z(oI-!Fe={+#^z`EmJ)`6>Bn`I-5G
z{M>wTeqnw|KFBZ2ugI^?ug!1E@5t}U@5%o*|7QN}{JZ)03k(Wu3+xLV3tS443UUfW
z1>%Cjg3Sf{3Jw$;DmYs3s!+8MDZ~oN!kL8&3l|rL7KRtr6v_(Q3p=U8?!s>hZxr4t
zyi<6uNWaLY$gaqt$hj!7NLZ9xlvh+xw5e!s(f*=?MMsKW7Edf@7o){Qv43$$@#5mJ
z;$_7V#jA?N#h|#XxT3hKSYEuPcu(>E;)BJ9ijNkbD1K9dmgtu_mAI6+l}s;LP_nRO
zWl4NVaY<Q8SIO3rgC$2wsN*GHmV8xmw&ZfjwUQr7ek^%j@<++5lGi1FQ7nq2)G1BM
zkTRjnDJ#mBvZvfBFUp6SPK8q8)N*PCwTj|XX;da9pmHfORX~+eYp5!!hU%gEsX=Op
z8ll!xH>k(duhetu59&4bMlw-?NO0!au!+Q6VkxnrB(@R<Nt`50B9)X$DkRksTGAnr
zOL`@vlAV$RlH-z#l1q}SlJ6xyN^VFVNPdw#mHY<S00RUd0S9P-`Cutn1|mQbSPjxa
z77&75Pyzrb18YDBkb@r33kHA!Yy&&MZm<s=1c$+Ca2A{g7r{M1Jp{ji$KY4+T&g0S
zAZ1H2DJfN#PLb+L4Wvd=H>s!8TRKfTUFt6lkuH*kO2egmX`D1sDwK+(`O+dOB?Z!I
z=~`*Mv{9;%j!M@{H%K>2w@MF6k4TS8zm$F@JuAH|y(axZ`lIx@^bhGP>1*j<rL0o2
zlvAozI*BUfmg<(8m0FhCl-ia0m(DJoTRN|FL1}PlL}_GcbZJ~^Vrg<|c4<y&UTJ>m
zy3&SHy0odZwY0rdQ94?>p>%WU*3vIZkCgsU`k?gB(zj(QWfRKSWmp+m#wpV(Gb^(!
zvo5nMb1ZWyb1U;K^Dgr#n_ITHY;_qZYbpDz>_{2)ec8QovRu1dr`)XExqNPUKzUI4
z!ty2MOUsv+uPl!$k13BY&o3`3r^=<}<>i&-HRbEd8_Ju?Tg%(ZhsuY`N6R;q-zopC
z{CW9{@>grT*34Zqf6an5!E0*P$kw#4>0Hyj=DRib);w7AXw8!fkBZq9b1UXo1Xh5G
zbrtm$jTOyQ#ifc{6?ZCru6R(XS7}{oTWMeERGC#-TuD`e%CgG+m8UDuRbH&TRQX-y
z^~xKSw<_;fKCOIJ1y!k6X;)3I;#C<|nN*oqSynk!c~#A=3akpLT3i)gwW4ZORa8}K
zRaTX-N>o)?RZ<12N~>zC+N$JLy;TEMBUS6GHdSq@qIOj6uR2|IuIggdrK<0$u2<ct
zx>fb4>Q&X-YL)5<)o3+QtzNBB&8xPowySomcB%HL_OAA=_Nxx6UR)hky{vjwHNQHx
zI=(u+T2x(HU0GdIy{?+BZmDjo?x-H9-cr4@dQbKK>O<8ht4~*-tv+9Uu|~DVxW>C?
zR!vCF;+in3W?4-{O=JzfCap$TBdW=-DXJ;0SyNM0Q(LpHW=GAPT8&y>t#Pee?abPM
z+MwEnwM%MO)UK-K*T&Yy*QVEI*5=kqYpZH&YwKzoYujo&YrAXvY6ogJ)NZalReQPi
zdhLzc+qFN}KCb<>_Id3ewXfDfYtglub$N9Kbrp3@byRCzdtFyuPhEfAP~FzL?RC5A
z_SPM!J6w0H?nK?AdX4&N^$GPE^`d&JURqyM-&o&TKU%-O{&@Y@^%v^DslQbJWBv2`
zKk8rC|JA^1fE!dB&<3JGy+N}<yTQ1@w86Z=sv)I8)F5ssXee&j*Kn%gtA?`;=NsWh
zPNQa{cH?BKF|;wdF|$$7nA<3BENm=k1dU~lbYn|nTVrRVys@{jzj3H>xN%40ceEZI
zNT<_P^Z<RBK24vc&(jy_pXg`w3;GrPhJM!sHBD?nn(!vICgUd4Ci5n%Cfg>5Cg-N9
zO&(3&O+HOao06Myng*J7G~I1_)r>SxYPN5tyqkTS{hDVs&uO05yr_9;^YZ4E&5_Nk
zn=_jQ&AH75&Be`<W@&SMbAR(d^M>Z#%?FwfHy>+0)qJM;T=RwI@0#y5|JwY#`H$w;
z&40D1wxBIUi+YP@i*}1gOGHaX%et11mf@DqS~j+9Y1!7Yqh)u?iI!6>XIjp+Tx_}2
za<%0<s^zy<<JK9i@vXwv^47-I=2ls2N2|QGr}gvJ1FeT!kF}m`J>7by^+xOC*1u#d
z87xzkp)x|IF4L45%gkh!G8>t_%t_`dbC-F_ykvp01X+emAS;tK$eLuWvUXXQtXsBT
zwn4U0wpn&k_O0xS>^s?Y*$vq(*;Cmw8TCT;O7=$fwheDnYtv}cZkyc3ZL?^zZnJB1
zY;$Rw+P0u=SzB6LW}Bcbw@utu*jCa8+REB0+N#^S+xprD+7xXgZR^`MwQXtJ+V(};
z&bHlcH`>|luI)kXqV~b|z3tz(|K4HI;n?BR;ny+0V^v37M_z}tqo$*&qqU>Gqo3*+
z>=^3U)N#7wLdWAyxKq2+u+ys3rqjODz0<#QZs+38h|b8)=+2bR)Xucd{LZ3Is#Dro
z-dWMv);ZLv=p61G?L5<Yt@D@8r=8C_Uv$3eeAD@^3+kHKg>>n58FU$UnRQuq*>u@=
zId!>qxp#SXg?1%%6?Rp3^>uCUy3j@a-1Sb5$Wb{i*Ou$ZC(DiG#&T1+o!nmTDEE|m
z$*0NZ%LC=X@<sAc`BHh5JVBl;PnBoLv*g8csk~fXDPJqEm(%iQ`LKM8e82pN{J8u}
z`C0jS`8V=Q^4s!X<gexLx}olg-B>r-&FR+cHt$~49oe1LE$kL`=TqH9-Bh=<yS%%y
zyQW*--P=9TJ=8tiJ=(pYdvo{J?(N+>yH9uD?*6R@?a}VB=?U(M=}GI!?<wk`dZaz&
zJrzBhdiM4l=sDbTtmkCUsh+QUzVEr!bGPSy&!e7aJuiA*_WarNSFd%ifA5Ok*xrQR
z<lfc2dA)0Tt9omD>v|h|spei;Z%6NF?}pyZy<2;?_wMT5+k2q*Q198^YrVhsp?&6k
zv-%eHrS^&YKwnv3MPGH_+P;>)w!Y53?!LahfxZoWyZVmwUFmz+_qw0#x9+#=ckFlR
zckB1)Pw5x*=l2)&Q~lEZvi^qt&i=ms!T#a?&-xGdAMHQW|ET}h0S+~wKVURqGGIR7
zGT=7gG2lHAGO%(WY9MAHZeU<w!@!Y&lLOZWejd~uoIE&lFm+HoSTI;LNDWpF)(oy2
ztREa1+&*|<@bKWV!IOih2frD-Ja}#J`@tUvZwx*dd_MSYX!4NRko}O;kn529kk`=6
zp*chIh608Hhk}Pvhbo6Y8={U5ogeyU=<?9Dq3?&T5B)auP5~(<DA)>2K`3+-JcYi(
zNMWLIR7_QPD7+PZikXTzig}7fiWQ1PMXDl0k*yFZ@)bpj5=Et=K_ORkD|!@ticN~o
z6<;WJD)uP$Db6ddDSlMkRNPVgtaz??rFf%wH#}jOJ&X+#!;`3C!(qE&=i#Zt9>YGv
ze#0||XAg%D^M|vB%ZIy%cMtCyJ}`WE_}K9E;h%>e55FGKAF&>>9dQ_O9+^54FcLJf
zaAe8I(vf8&(IZJCt4GpDvPJ|W)QEJXe57)uc|<nSKGHQZI<jG8)5zx|$44%XTpGDL
z^4-Yukv~RWjl3CoJL=0G#YV|d_0cJ#Ge_r*W{(z(_KXgWo*w;S^ycWj@&8|fpz%-g
M%J}Dp_t6Lc2gd+q<NyEw

delta 14869
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
B2ao^&

diff --git a/make-mac.mk b/make-mac.mk
index abadbbe..235f819 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -67,21 +67,36 @@ else
 	STRIP=strip
 endif
 
-# Debug output for Network Containers 
-# Specific levels can be controlled in netcon/common.inc.c
+# Debug output for SDK 
+# Specific levels can be controlled in src/debug.h
 ifeq ($(SDK_DEBUG),1)
 	DEFS+=-DSDK_DEBUG
 endif
 
 CXXFLAGS=$(CFLAGS) -fno-rtti
 
+all:
+
+# TODO: CHECK if XCODE TOOLS are installed
 # Build frameworks for application development
+OSX_app_framework: 
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_OSX build SYMROOT="../../../build/OSX_app_framework"
+iOS_app_framework: 
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_iOS build SYMROOT="../../../build/iOS_app_framework"
+
 # Build bundles for Unity integrations
-all: 
-	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_OSX build SYMROOT="../../../build/OSX_Framework"
-	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_iOS build SYMROOT="../../../build/iOS_Framework"
-	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_Unity3D_OSX build SYMROOT="../../../build/OSX_Unity_Bundle"
-	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_Unity3D_iOS build SYMROOT="../../../build/iOS_Unity_Bundle"
+OSX_unity3d_bundle:
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_Unity3D_OSX build SYMROOT="../../../build/OSX_unity3d_bundle"
+iOS_unity3d_bundle:
+	cd integrations/Apple/ZeroTierSDK_Apple; xcodebuild -scheme ZeroTierSDK_Unity3D_iOS build SYMROOT="../../../build/iOS_unity3d_bundle"
+
+# TODO: CHECK if ANDROID/GRADLE TOOLS are installed
+
+# Build JNI library for Android app integration
+Android_JNI_library:
+	cd integrations/Android/proj; ./gradlew assembleDebug
+
+# Build library for Android Unity integrations
 
 sdk: $(OBJS)
 	rm -f *.o
@@ -99,15 +114,13 @@ sdk: $(OBJS)
 	ln -sf zerotier-netcon-service zerotier-cli
 	ln -sf zerotier-netcon-service zerotier-idtool
 
-selftest: $(OBJS) selftest.o
-	$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
-	$(STRIP) zerotier-selftest
-
 clean:
-	rm -rf build
+	rm -rf build/*
+	find . -type f -name '*.o' -delete
+	find . -type f -name '*.so' -delete
+	find . -type f -name '*.o.d' -delete
 	# Remove junk generated by Android builds
-	rm -rf netcon/Android/*.o.d
-	rm -rf netcon/Netcon-Android/proj/app/build/intermediates
-	rm -rf netcon/*.o netcon/*.so *.dSYM build-* *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o ext/lz4/*.o ext/json-parser/*.o $(OBJS) netcon/zerotier-intercept zerotier-netcon-service ztproxy libztapi.so libztkq.so libztintercept.so zerotier-one zerotier-idtool zerotier-selftest zerotier-cli ZeroTierOneInstaller-* mkworld
-
+	cd integrations/Android/proj; ./gradlew clean
+	rm -rf integrations/Android/proj/.gradle
+	rm -rf integrations/Android/proj/.idea
 FORCE:
diff --git a/src/SDK.h b/src/SDK.h
index ff7eb31..06e0e1b 100644
--- a/src/SDK.h
+++ b/src/SDK.h
@@ -40,7 +40,6 @@ extern "C" {
 
 void zt_init_rpc(char *nwid);
 const char *get_netpath();
-bool check_intercept_enabled_for_thread();
 
 #if defined(__linux__)
 	static int (*realaccept4)(ACCEPT4_SIG) = 0;
@@ -50,6 +49,7 @@ bool check_intercept_enabled_for_thread();
 #endif
 
 #if !defined(__ANDROID__)
+    bool check_intercept_enabled_for_thread();
 	static int (*realbind)(BIND_SIG) = 0;
 	static int (*realsendmsg)(SENDMSG_SIG) = 0;
 	static ssize_t (*realsendto)(SENDTO_SIG) = 0;
diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp
index 9aef71e..87b82ab 100644
--- a/src/SDK_ServiceSetup.cpp
+++ b/src/SDK_ServiceSetup.cpp
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <pthread.h>
 
-#include "OneService.hpp"
+#include "service/OneService.hpp"
 #include "Utils.hpp"
 #include "OSUtils.hpp"