gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,387 Commits 1 Branch 40 Tags
02dbc8fa787574b3ccac238bc836654f5121e482
Commit Graph

1387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Henry
02dbc8fa78 Merge pull request #236 from zerotier/brenton/fix-typos 
Fix typos and bump ZTO submodule commit to include Fix typos (https:/…
 2023-08-02 08:38:12 -07:00
Brenton Bostick
b85a6a4597 Fix typos and bump ZTO submodule commit to include Fix typos (https://github.com/zerotier/ZeroTierOne/pull/2075) 2023-08-02 11:29:22 -04:00
Joseph Henry
2d83bc25f3 Fix tcp relay api logic error 2023-07-26 12:42:43 -07:00
Joseph Henry
10548d9b05 Fix mismatched types in tcp relay api 2023-07-26 12:41:18 -07:00
Joseph Henry
5874e442eb Port over TCP relay functionality from ZeroTier One 2023-07-24 18:56:40 -07:00
Joseph Henry
ca83e941a4 Merge pull request #230 from zerotier/brenton/fix-no-such-file-or-directory-error 
fix 'No such file or directory' error
 2023-07-20 10:31:06 -07:00
Joseph Henry
e0200fbde0 Merge pull request #231 from zerotier/brenton/fix-return-type-warnings 
fix return type warnings
 2023-07-20 10:30:01 -07:00
Joseph Henry
a3b3d8217d Merge pull request #232 from zerotier/brenton/fix-missing-jni-function 
fix: Cannot resolve corresponding JNI function Java_com_zerotier_sock…
 2023-07-20 10:29:50 -07:00
Joseph Henry
1230544134 Merge pull request #233 from zerotier/brenton/fix-unused-warnings 
fix unused warnings
 2023-07-20 10:29:28 -07:00
Brenton Bostick
a0ffaec02c fix return type warnings 
Not any of these functions are used in ZeroTierNative.java

libzt/src/bindings/java/JavaSockets.cxx:600:1: warning: non-void function does not return a value [-Wreturn-type]
libzt/src/bindings/java/JavaSockets.cxx:620:1: warning: non-void function does not return a value [-Wreturn-type]
libzt/src/bindings/java/JavaSockets.cxx:629:1: warning: non-void function does not return a value [-Wreturn-type]
libzt/src/bindings/java/JavaSockets.cxx:638:1: warning: non-void function does not return a value [-Wreturn-type]
 2023-07-19 15:50:14 -04:00
Brenton Bostick
fd000261d6 fix 'No such file or directory' error 
Using a wildcard in cp was breaking the command when more than 1 file is
present
```
brenton@Brentons-MacBook-Air libzt % ./build.sh android-aar "release"

<< build release aar >>

brenton@Brentons-MacBook-Air libzt % 
brenton@Brentons-MacBook-Air libzt % ./build.sh android-aar "debug"  

<< build debug aar >>

...

BUILD SUCCESSFUL in 48s
33 actionable tasks: 28 executed, 5 up-to-date
cp: target '/Users/brenton/development/github/libzt/dist/android-any-android-debug/libzt-debug.aar': No such file or directory
/Users/brenton/development/github/libzt

 - Build cache  : /Users/brenton/development/github/libzt/cache/android-any-android-debug
 - Build output : /Users/brenton/development/github/libzt/dist

0	/Users/brenton/development/github/libzt/dist/android-any-android-debug
brenton@Brentons-MacBook-Air libzt %
```
 2023-07-19 15:48:53 -04:00
Brenton Bostick
88681c02c4 fix: Cannot resolve corresponding JNI function Java_com_zerotier_sockets_ZeroTierNative_zts_1net_1get_1mac. 2023-07-19 15:47:12 -04:00
Brenton Bostick
6ce18af3e6 fix unused warnings 
libzt/src/bindings/java/JavaSockets.cxx:40:10: warning: unused variable 'rs' [-Wunused-variable]
libzt/src/Events.cpp:185:14: warning: unused variable 'rs' [-Wunused-variable]
libzt/src/Events.cpp:189:18: warning: unused variable 'arg' [-Wunused-variable]
libzt/src/NodeService.cpp:1064:17: warning: variable 'err' set but not used [-Wunused-but-set-variable]
 2023-07-19 15:19:40 -04:00
Travis LaDuke
279fc187d6 Merge pull request #229 from zerotier/brenton/fix-links 
Brenton/fix links
 2023-07-19 08:55:57 -07:00
Travis LaDuke
f856f04956 Merge pull request #228 from zerotier/brenton/fix-typos 
Brenton/fix typos
 2023-07-19 08:55:33 -07:00
Brenton Bostick
8066b0e81f fix typos 2023-07-19 10:39:11 -04:00
Brenton Bostick
8d6d515bee fix links 2023-07-19 10:28:31 -04:00
Joseph Henry
9f363342d9 Fix typo in return type 2023-07-18 13:06:19 -07:00
Joseph Henry
27805f8ff2 Add low-bandwidth mode 2023-07-18 13:04:40 -07:00
Joseph Henry
e60239329c Bump ZTO submodule commit to include iOS fix 2023-07-17 16:53:09 -07:00
Joseph Henry
cf07630272 Merge pull request #227 from zerotier/brenton/update-examples 
Update examples:
 2023-06-30 10:44:23 -07:00
Brenton Bostick
fad04bf3c7 Update examples: 
Remove empty MainActivity.java Android example
fix CMake variable BUILD_EXAMPLES -> BUILD_HOST_EXAMPLES
fix some names in example usage messages:
pingable-node -> callbackapi
client -> nonblockingclient
server -> nonblockingserver
pingable-node -> statistics
 2023-06-30 12:11:24 -04:00
Joseph Henry
916a2ce2f4 Update iOS SDK version to 16.4 2023-06-06 09:57:59 -07:00
Joseph Henry
eabceab937 Update ZTO submodule to 1.10.6-dev 2023-06-06 09:57:26 -07:00
Joseph Henry
bfa02c5f92 Merge pull request #223 from zerotier/ldr/rust-demo 
Rust demo updates
 2023-06-06 09:32:40 -07:00
Joseph Henry
8c9ac1198d Merge pull request #221 from zerotier/brenton/add-prometheus 
add new prometheus headers that are now used by ZeroTierOne
 2023-06-06 09:28:19 -07:00
Lennon Day-Reynolds
91b190da73 should work for non-oneshot (request/response) protocols a little better now 2023-06-05 21:58:54 -07:00
Lennon Day-Reynolds
787dd6efc1 new rust demo + cleanup of build 2023-06-05 19:14:12 -07:00
Joseph Henry
356dcd05f6 Update Java example 2023-06-04 15:07:32 -07:00
Joseph Henry
4aa57d7360 Merge pull request #222 from zerotier/brenton/fix-android-build 
Fix a few issues with Android build
 2023-06-02 13:33:33 -07:00
Brenton Bostick
0d81706227 Fix a few issues with Android build 
* do not remove miniupnpc/VERSION (unsure what previous problem was)
* do not need to export PATH
* do not copy source files, allow gradle to build from source
* leave outputs from gradle (copy to PKG_OUTPUT_DIR instead of move)
 2023-06-02 16:30:14 -04:00
Brenton Bostick
87e344bdb7 add new prometheus headers that are now used by ZeroTierOne 2023-06-01 11:16:03 -04:00
Joseph Henry
03670cc18b Merge pull request #220 from zerotier/brenton/fix-overloaded 
Fix warning about function never used
 2023-05-30 11:27:25 -07:00
Brenton Bostick
8a90a7baca Fix warning about function never used 
The practice of appending "__" with type signature allows for references
overloaded methods.
But there is only a single zts_bsd_write method, so just remove.
 2023-05-26 13:13:03 -04:00
Joseph Henry
7d82d0ed77 Merge pull request #218 from zerotier/brenton/fix-typos 
Brenton/fix typos
 2023-05-26 10:12:24 -07:00
Joseph Henry
bb578e9879 Merge pull request #219 from zerotier/brenton/update-gradle 
update various settings for Android and Gradle
 2023-05-26 10:04:38 -07:00
Joseph Henry
57fd2e2128 Merge pull request #217 from zerotier/brenton/fix-bad-param 
fix bad parameter
 2023-05-26 09:57:50 -07:00
Joseph Henry
38334d843e Merge pull request #216 from zerotier/brenton/fix-stray-getfieldid 
fix stray GetFieldID
 2023-05-26 09:57:40 -07:00
Joseph Henry
044d2ce0ca Merge pull request #215 from zerotier/brenton/fix-this 
fix: Incorrect type for parameter 'thisObj', which should have type '…
 2023-05-26 09:57:13 -07:00
Brenton Bostick
f65686869a update various settings for Android and Gradle 2023-05-26 11:14:21 -04:00
Brenton Bostick
e47e37d12e fix stray GetFieldID 2023-05-25 15:54:19 -04:00
Brenton Bostick
472b4d37f7 fix bad parameter 2023-05-25 15:53:50 -04:00
Brenton Bostick
18c009d55d fix: Incorrect type for parameter 'thisObj', which should have type 'jclass'. 2023-05-25 15:49:10 -04:00
Brenton Bostick
8bd9a18a38 remove stray U+200b characters 2023-05-25 15:43:38 -04:00
Brenton Bostick
51af6aacd9 Fix typo TCP_SLOW_INTERVALs -> TCP_SLOW_INTERVAL 2023-05-25 15:43:34 -04:00
Brenton Bostick
d00f72ae92 Fix typo accetpedFd -> acceptedFd 2023-05-25 15:43:31 -04:00
Brenton Bostick
8952a6bf95 Fix typos ZTS_CENRTAL_MAX_URL_LEN -> ZTS_CENTRAL_MAX_URL_LEN 2023-05-25 15:43:28 -04:00
Joseph Henry
4531b38bc0 Merge pull request #214 from zerotier/brenton/move 
Move java files to com/zerotier/sockets subfolder
 2023-05-25 10:36:41 -07:00
Brenton Bostick
48adf41cc1 Move java files to com/zerotier/sockets subfolder 
This adheres to standard Java style and fixes:
Package name 'com.zerotier.sockets' does not correspond to the file path ''

in Android Studio
 2023-05-22 15:36:21 -04:00
Joseph Henry
71c2f97056 Fix broken include path for JSON library 2023-02-21 13:45:27 -08:00