Paritally updated Android Studio project

integrations/Android/java/jni/Android.mk

@@ -16,10 +16,10 @@ LOCAL_LDLIBS := -llog
 
 # Netcon files
 LOCAL_SRC_FILES := \
-	$(ZT1)/netcon/NetconRPC.c \
-	$(ZT1)/netcon/NetconProxy.cpp \
-	$(ZT1)/netcon/NetconServiceSetup.cpp \
-	$(ZT1)/netcon/NetconEthernetTap.cpp
+	$(ZT1)/src/SDK_RPC.c \
+	$(ZT1)/src/SDK_Proxy.cpp \
+	$(ZT1)/src/SDK_ServiceSetup.cpp \
+	$(ZT1)/src/SDK_EthernetTap.cpp
 
 # ZeroTierOne ext files
 LOCAL_SRC_FILES += \

integrations/Android/java/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := clang
 APP_STL := c++_static
-APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SERVICE_NETCON -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
+APP_CPPFLAGS := -O3 -DUSE_SOCKS_PROXY -DZT_SDK -fPIC -fPIE -fvectorize -Wall -fstack-protector -fexceptions -fno-strict-aliasing -Wno-deprecated-register -DZT_NO_TYPE_PUNNING=1
 APP_PLATFORM := android-14
 
 # Architectures

integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java

@@ -1,12 +1,12 @@
 package Netcon;
 
 /**
- * Created by Joseph on 3/14/16.
+ * Created by Joseph Henry on 3/14/16.
  */
-public class NetconWrapper {
+public class ZT_SDK_Wrapper {
     public native int loadsymbols();
 
-    // From OneServiceSetup.cpp
+    // From SDK_ServiceSetup.cpp
     public native void startOneService();
 
     static {

integrations/iOS/Netcon-iOS/Base.lproj/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.pbxproj

@@ -961,19 +961,14 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				HEADER_SEARCH_PATHS = (
-					"$(SRC_ROOT)/../../../ext/lwip/src/include/lwip/**",
-					"$(SRC_ROOT)/../../../ext/lwip/src/include/**",
-					"$(SRC_ROOT)/../../ext/lwip/src/include/**",
-					"$(SRC_ROOT)/../../../../ext/lwip/src/include/**",
-				);
+				HEADER_SEARCH_PATHS = "$(SRC_ROOT)/../../../ext/lwip/src/include";
 				INFOPLIST_FILE = ZeroTierSDK_iOS/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "zerotier.ZeroTierSDK-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "$(SRC_ROOT)/../../../ext/lwip/src/include";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Debug;
 		};
@@ -985,19 +980,14 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				HEADER_SEARCH_PATHS = (
-					"$(SRC_ROOT)/../../../ext/lwip/src/include/lwip/**",
-					"$(SRC_ROOT)/../../../ext/lwip/src/include/**",
-					"$(SRC_ROOT)/../../ext/lwip/src/include/**",
-					"$(SRC_ROOT)/../../../../ext/lwip/src/include/**",
-				);
+				HEADER_SEARCH_PATHS = "$(SRC_ROOT)/../../../ext/lwip/src/include";
 				INFOPLIST_FILE = ZeroTierSDK_iOS/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "zerotier.ZeroTierSDK-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				USER_HEADER_SEARCH_PATHS = "$(SRC_ROOT)/../../../ext/lwip/src/include";
+				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Release;
 		};

src/SDK_ServiceSetup.cpp

@@ -145,7 +145,8 @@ extern "C" {
  * Starts a new service instance
  */
 #if defined(__ANDROID__)
-    JNIEXPORT void JNICALL Java_Netcon_NetconWrapper_startOneService(JNIEnv *env, jobject thisObj)
+    JNIEXPORT void JNICALL Java_SDK_SDK_Wrapper_startOneService(JNIEnv *env, jobject thisObj)
+    //JNIEXPORT void JNICALL Java_Netcon_NetconWrapper_startOneService(JNIEnv *env, jobject thisObj)
     {
 #else
     void *startOneService(void *thread_id)

src/SDK_ServiceSetup.hpp

@@ -40,7 +40,7 @@ extern "C" {
 #define INTERCEPT_DISABLED  222
     
 #if defined(__ANDROID__)	
-	JNIEXPORT void JNICALL Java_SDK_SDKWrapper_startOneService(JNIEnv *env, jobject thisObj);
+	JNIEXPORT void JNICALL Java_SDK_SDK_Wrapper_startOneService(JNIEnv *env, jobject thisObj);
 #else
 	void *startOneService(void *thread_id);
 	void init_service(int key, const char * path);