diff --git a/integrations/Android/java/jni/Android.mk b/integrations/Android/java/jni/Android.mk index 169a208..638e029 100644 --- a/integrations/Android/java/jni/Android.mk +++ b/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 += \ diff --git a/integrations/Android/java/jni/Application.mk b/integrations/Android/java/jni/Application.mk index 38f3057..1d7c448 100644 --- a/integrations/Android/java/jni/Application.mk +++ b/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 diff --git a/integrations/Android/proj/app/src/main/java/Netcon/NetconWrapper.java b/integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java similarity index 62% rename from integrations/Android/proj/app/src/main/java/Netcon/NetconWrapper.java rename to integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java index 55fc09a..ca46db0 100644 --- a/integrations/Android/proj/app/src/main/java/Netcon/NetconWrapper.java +++ b/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 { diff --git a/integrations/iOS/Netcon-iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/iOS/Netcon-iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 6808705..6fe508e 100644 Binary files a/integrations/iOS/Netcon-iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/iOS/Netcon-iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/integrations/iOS/Netcon-iOS/Base.lproj/Main.storyboard b/integrations/iOS/Netcon-iOS/Base.lproj/Main.storyboard index c82b175..2257646 100644 --- a/integrations/iOS/Netcon-iOS/Base.lproj/Main.storyboard +++ b/integrations/iOS/Netcon-iOS/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + diff --git a/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.pbxproj b/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.pbxproj index 4a5d759..a0d9109 100644 --- a/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.pbxproj +++ b/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; }; diff --git a/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate b/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate index 7c6f5c7..f30b4b0 100644 Binary files a/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate and b/integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/SDK_ServiceSetup.cpp b/src/SDK_ServiceSetup.cpp index a864783..0a8abde 100644 --- a/src/SDK_ServiceSetup.cpp +++ b/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) diff --git a/src/SDK_ServiceSetup.hpp b/src/SDK_ServiceSetup.hpp index 1ccf1fb..940c3de 100644 --- a/src/SDK_ServiceSetup.hpp +++ b/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);