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

improved debugging usability for all platforms

Browse Source
This commit is contained in:
Joseph Henry
2016-09-06 15:07:06 -07:00
parent 9943db56d2
commit 1af75c386e
15 changed files with 458 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
integrations/android/example_app/app/src/main/java/ZeroTier/ZTSDK.java
View File

@@ -102,9 +102,9 @@ public class ZTSDK {
return zt_get_proxy_port(nwid);
}
public native boolean zt_running();
public boolean running() {
return zt_running();
public native boolean zt_service_is_running();
public boolean service_is_running() {
return zt_service_is_running();
}
@@ -272,4 +272,11 @@ public class ZTSDK {
//public static native int zt_getsockopt(int fd, int type, int protocol);
//public static native int zt_setsockopt(int fd, int type, int protocol);
//public static native int zt_getsockname(int fd, int type, int protocol);
// PROXY SERVER CONTROLS
public native boolean zt_proxy_is_running();
public boolean proxy_is_running() {
return zt_proxy_is_running();
}
}

9
integrations/android/example_app/app/src/main/java/com/example/joseph/example_app/MainActivity.java
View File

@@ -34,7 +34,14 @@ public class MainActivity extends AppCompatActivity {
zt.start_service(homeDir);
}
}).start();
while(!zt.running()) { }
while(!zt.service_is_running()) { }
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// client/server mode toggle
int mode = 4, err;

10
integrations/apple/ZeroTierSDK_Apple/ZeroTierSDK_Apple.xcodeproj/project.pbxproj
View File

@@ -12,7 +12,6 @@
7C9587951D6FB4C80014AF6B /* SDK_Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */; };
7CAA03DF1D628E88003F9B1A /* SDK_Service.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */; };
7CC003261D1216E3003E68DC /* ZeroTierSDK_iOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CC003251D1216E3003E68DC /* ZeroTierSDK_iOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
7CC003501D12178D003E68DC /* SDK_Debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003421D12178D003E68DC /* SDK_Debug.c */; };
7CC003511D12178D003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; };
7CC003521D12178D003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; };
7CC003531D12178D003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; };
@@ -84,7 +83,6 @@
7CC004351D121840003E68DC /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0041C1D121840003E68DC /* Utils.cpp */; };
7CC0043A1D12184F003E68DC /* ControlPlane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC004361D12184F003E68DC /* ControlPlane.cpp */; };
7CC0043B1D12184F003E68DC /* OneService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC004381D12184F003E68DC /* OneService.cpp */; };
7CC0043C1D1316BF003E68DC /* SDK_Debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003421D12178D003E68DC /* SDK_Debug.c */; };
7CC0043D1D1316BF003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; };
7CC0043E1D1316BF003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; };
7CC0043F1D1316BF003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; };
@@ -156,7 +154,6 @@
7CC004841D131704003E68DC /* tcpip.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003641D1217C3003E68DC /* tcpip.c */; };
7CC004851D1318DA003E68DC /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0035A1D1217B2003E68DC /* lz4.c */; };
7CC004861D1318DA003E68DC /* http_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003571D1217A1003E68DC /* http_parser.c */; };
7CC004871D131E21003E68DC /* SDK_Debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003421D12178D003E68DC /* SDK_Debug.c */; };
7CC004881D131E21003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; };
7CC004891D131E21003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; };
7CC0048A1D131E21003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; };
@@ -228,7 +225,6 @@
7CC004D01D131E37003E68DC /* lz4.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC0035A1D1217B2003E68DC /* lz4.c */; };
7CC004D11D131E37003E68DC /* http_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003571D1217A1003E68DC /* http_parser.c */; };
7CC004D21D131F76003E68DC /* ip_addr.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003921D1217DD003E68DC /* ip_addr.c */; };
7CC004D71D13247A003E68DC /* SDK_Debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003421D12178D003E68DC /* SDK_Debug.c */; };
7CC004D81D13247A003E68DC /* SDK_EthernetTap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */; };
7CC004D91D13247A003E68DC /* SDK_Intercept.c in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003461D12178D003E68DC /* SDK_Intercept.c */; };
7CC004DA1D13247A003E68DC /* SDK_Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC003481D12178D003E68DC /* SDK_Proxy.cpp */; };
@@ -314,7 +310,6 @@
7CC003341D1216F8003E68DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7CC0033C1D121741003E68DC /* ZeroTierSDK_Unity3D_OSX.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ZeroTierSDK_Unity3D_OSX.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
7CC0033E1D121742003E68DC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7CC003421D12178D003E68DC /* SDK_Debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDK_Debug.c; path = ../../../src/SDK_Debug.c; sourceTree = "<group>"; };
7CC003431D12178D003E68DC /* SDK_Debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDK_Debug.h; path = ../../../src/SDK_Debug.h; sourceTree = "<group>"; };
7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SDK_EthernetTap.cpp; path = ../../../src/SDK_EthernetTap.cpp; sourceTree = "<group>"; };
7CC003451D12178D003E68DC /* SDK_EthernetTap.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SDK_EthernetTap.hpp; path = ../../../src/SDK_EthernetTap.hpp; sourceTree = "<group>"; };
@@ -733,7 +728,6 @@
isa = PBXGroup;
children = (
7CAA03DE1D628E88003F9B1A /* SDK_Service.cpp */,
7CC003421D12178D003E68DC /* SDK_Debug.c */,
7CC003431D12178D003E68DC /* SDK_Debug.h */,
7CC003441D12178D003E68DC /* SDK_EthernetTap.cpp */,
7CC003451D12178D003E68DC /* SDK_EthernetTap.hpp */,
@@ -958,7 +952,6 @@
7CC003821D1217D1003E68DC /* memp.c in Sources */,
7CC003661D1217C3003E68DC /* api_msg.c in Sources */,
7CC004291D121840003E68DC /* NetworkConfig.cpp in Sources */,
7CC003501D12178D003E68DC /* SDK_Debug.c in Sources */,
7CC004321D121840003E68DC /* SHA512.cpp in Sources */,
7CC003531D12178D003E68DC /* SDK_Proxy.cpp in Sources */,
7CC003961D1217DD003E68DC /* icmp.c in Sources */,
@@ -1101,7 +1094,6 @@
7CC0045D1D1316F5003E68DC /* BackgroundResolver.cpp in Sources */,
7CC0045E1D1316F5003E68DC /* Http.cpp in Sources */,
7CC0045F1D1316F5003E68DC /* OSUtils.cpp in Sources */,
7CC0043C1D1316BF003E68DC /* SDK_Debug.c in Sources */,
7CC0043D1D1316BF003E68DC /* SDK_EthernetTap.cpp in Sources */,
7CC0043E1D1316BF003E68DC /* SDK_Intercept.c in Sources */,
7CC0043F1D1316BF003E68DC /* SDK_Proxy.cpp in Sources */,
@@ -1152,7 +1144,6 @@
7CC004CD1D131E2D003E68DC /* netifapi.c in Sources */,
7CC004CE1D131E2D003E68DC /* sockets.c in Sources */,
7CC004CF1D131E2D003E68DC /* tcpip.c in Sources */,
7CC004871D131E21003E68DC /* SDK_Debug.c in Sources */,
7CC004881D131E21003E68DC /* SDK_EthernetTap.cpp in Sources */,
7CC004891D131E21003E68DC /* SDK_Intercept.c in Sources */,
7CC0048A1D131E21003E68DC /* SDK_Proxy.cpp in Sources */,
@@ -1261,7 +1252,6 @@
7CC004F81D1324A2003E68DC /* BackgroundResolver.cpp in Sources */,
7CC004F91D1324A2003E68DC /* Http.cpp in Sources */,
7CC004FA1D1324A2003E68DC /* OSUtils.cpp in Sources */,
7CC004D71D13247A003E68DC /* SDK_Debug.c in Sources */,
7CC004D81D13247A003E68DC /* SDK_EthernetTap.cpp in Sources */,
7CC004D91D13247A003E68DC /* SDK_Intercept.c in Sources */,
7CC004DA1D13247A003E68DC /* SDK_Proxy.cpp in Sources */,