gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paritally updated Android Studio project

Browse Source
This commit is contained in:
Joseph Henry
2016-06-15 14:19:56 -07:00
parent ac0699c362
commit c46bc402e0
9 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integrations/Android/java/jni/Android.mk
View File

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

2
integrations/Android/java/jni/Application.mk
View File

@@ -1,6 +1,6 @@
NDK_TOOLCHAIN_VERSION := clang NDK_TOOLCHAIN_VERSION := clang
APP_STL := c++_static 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 APP_PLATFORM := android-14
# Architectures # Architectures

6
integrations/Android/proj/app/src/main/java/Netcon/NetconWrapper.java → integrations/Android/proj/app/src/main/java/Netcon/ZT_SDK_Wrapper.java
View File

@@ -1,12 +1,12 @@
package Netcon; 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(); public native int loadsymbols();
// From OneServiceSetup.cpp // From SDK_ServiceSetup.cpp
public native void startOneService(); public native void startOneService();
static { static {

BIN
integrations/iOS/Netcon-iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

2
integrations/iOS/Netcon-iOS/Base.lproj/Main.storyboard
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?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> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

18
integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.pbxproj
View File

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

BIN
integrations/iOS_new/ZeroTierSDK_iOS/ZeroTierSDK_iOS.xcodeproj/project.xcworkspace/xcuserdata/Joseph.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

3
src/SDK_ServiceSetup.cpp
View File

@@ -145,7 +145,8 @@ extern "C" {
* Starts a new service instance * Starts a new service instance
*/ */
#if defined(__ANDROID__) #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 #else
void *startOneService(void *thread_id) void *startOneService(void *thread_id)

2
src/SDK_ServiceSetup.hpp
View File

@@ -40,7 +40,7 @@ extern "C" {
#define INTERCEPT_DISABLED 222 #define INTERCEPT_DISABLED 222
#if defined(__ANDROID__) #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 #else
void *startOneService(void *thread_id); void *startOneService(void *thread_id);
void init_service(int key, const char * path); void init_service(int key, const char * path);