Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into main #253

Merged
merged 89 commits into from
Aug 23, 2023
Merged

Merge dev into main #253

merged 89 commits into from
Aug 23, 2023

Commits on Jun 1, 2022

  1. Configuration menu
    Copy the full SHA
    a6f6886 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    361c6ff View commit details
    Browse the repository at this point in the history
  3. Update README.md

    joseph-henry committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    0bcae7b View commit details
    Browse the repository at this point in the history
  4. Tweak build.sh

    joseph-henry committed Jun 1, 2022
    Configuration menu
    Copy the full SHA
    cc58bce View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2022

  1. Bump regex from 1.5.4 to 1.5.6 in /pkg/crate/libzt

    Bumps [regex](https://github.com/rust-lang/regex) from 1.5.4 to 1.5.6.
    - [Release notes](https://github.com/rust-lang/regex/releases)
    - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
    - [Commits](rust-lang/regex@1.5.4...1.5.6)
    
    ---
    updated-dependencies:
    - dependency-name: regex
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jun 6, 2022
    Configuration menu
    Copy the full SHA
    7ad5b78 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. Merge pull request #186 from zerotier/dependabot/cargo/pkg/crate/libz…

    …t/regex-1.5.6
    
    Bump regex from 1.5.4 to 1.5.6 in /pkg/crate/libzt
    joseph-henry authored Jun 9, 2022
    Configuration menu
    Copy the full SHA
    eca2f5b View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. upgrade gradle versions and include .cxx bindings

    tejas238 committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    038166f View commit details
    Browse the repository at this point in the history
  2. Merge pull request #201 from tejas238/android-fixes-tejas

    upgrade gradle versions and include .cxx bindings
    joseph-henry authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    0cb84aa View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Configuration menu
    Copy the full SHA
    9d66844 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b4e06b6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    71c2f97 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. 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
    bostick committed May 22, 2023
    Configuration menu
    Copy the full SHA
    48adf41 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Merge pull request #214 from zerotier/brenton/move

    Move java files to com/zerotier/sockets subfolder
    joseph-henry authored May 25, 2023
    Configuration menu
    Copy the full SHA
    4531b38 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8952a6b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d00f72a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    51af6aa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8bd9a18 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    18c009d View commit details
    Browse the repository at this point in the history
  7. fix bad parameter

    bostick committed May 25, 2023
    Configuration menu
    Copy the full SHA
    472b4d3 View commit details
    Browse the repository at this point in the history
  8. fix stray GetFieldID

    bostick committed May 25, 2023
    Configuration menu
    Copy the full SHA
    e47e37d View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Configuration menu
    Copy the full SHA
    f656868 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #215 from zerotier/brenton/fix-this

    fix: Incorrect type for parameter 'thisObj', which should have type '…
    joseph-henry authored May 26, 2023
    Configuration menu
    Copy the full SHA
    044d2ce View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    38334d8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #217 from zerotier/brenton/fix-bad-param

    fix bad parameter
    joseph-henry authored May 26, 2023
    Configuration menu
    Copy the full SHA
    57fd2e2 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #219 from zerotier/brenton/update-gradle

    update various settings for Android and Gradle
    joseph-henry authored May 26, 2023
    Configuration menu
    Copy the full SHA
    bb578e9 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #218 from zerotier/brenton/fix-typos

    Brenton/fix typos
    joseph-henry authored May 26, 2023
    Configuration menu
    Copy the full SHA
    7d82d0e View commit details
    Browse the repository at this point in the history
  7. 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.
    bostick committed May 26, 2023
    Configuration menu
    Copy the full SHA
    8a90a7b View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Merge pull request #220 from zerotier/brenton/fix-overloaded

    Fix warning about function never used
    joseph-henry authored May 30, 2023
    Configuration menu
    Copy the full SHA
    03670cc View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Configuration menu
    Copy the full SHA
    87e344b View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. 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)
    bostick committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    0d81706 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #222 from zerotier/brenton/fix-android-build

    Fix a few issues with Android build
    joseph-henry authored Jun 2, 2023
    Configuration menu
    Copy the full SHA
    4aa57d7 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2023

  1. Update Java example

    joseph-henry committed Jun 4, 2023
    Configuration menu
    Copy the full SHA
    356dcd0 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Configuration menu
    Copy the full SHA
    787dd6e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    91b190d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #221 from zerotier/brenton/add-prometheus

    add new prometheus headers that are now used by ZeroTierOne
    joseph-henry authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    8c9ac11 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #223 from zerotier/ldr/rust-demo

    Rust demo updates
    joseph-henry authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bfa02c5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    eabceab View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    916a2ce View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. 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
    bostick committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    fad04bf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cf07630 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Configuration menu
    Copy the full SHA
    e602393 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Add low-bandwidth mode

    joseph-henry committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    27805f8 View commit details
    Browse the repository at this point in the history
  2. Fix typo in return type

    joseph-henry committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    9f36334 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. fix links

    bostick committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    8d6d515 View commit details
    Browse the repository at this point in the history
  2. fix typos

    bostick committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    8066b0e View commit details
    Browse the repository at this point in the history
  3. Merge pull request #228 from zerotier/brenton/fix-typos

    Brenton/fix typos
    laduke authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    f856f04 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #229 from zerotier/brenton/fix-links

    Brenton/fix links
    laduke authored Jul 19, 2023
    Configuration menu
    Copy the full SHA
    279fc18 View commit details
    Browse the repository at this point in the history
  5. 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]
    bostick committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    6ce18af View commit details
    Browse the repository at this point in the history
  6. fix: Cannot resolve corresponding JNI function Java_com_zerotier_sock…

    …ets_ZeroTierNative_zts_1net_1get_1mac.
    bostick committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    88681c0 View commit details
    Browse the repository at this point in the history
  7. 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 %
    ```
    bostick committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    fd00026 View commit details
    Browse the repository at this point in the history
  8. 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]
    bostick committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    a0ffaec View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Configuration menu
    Copy the full SHA
    1230544 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #232 from zerotier/brenton/fix-missing-jni-function

    fix: Cannot resolve corresponding JNI function Java_com_zerotier_sock…
    joseph-henry authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    a3b3d82 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #231 from zerotier/brenton/fix-return-type-warnings

    fix return type warnings
    joseph-henry authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    e0200fb View commit details
    Browse the repository at this point in the history
  4. Merge pull request #230 from zerotier/brenton/fix-no-such-file-or-dir…

    …ectory-error
    
    fix 'No such file or directory' error
    joseph-henry authored Jul 20, 2023
    Configuration menu
    Copy the full SHA
    ca83e94 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Configuration menu
    Copy the full SHA
    5874e44 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    10548d9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2d83bc2 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Configuration menu
    Copy the full SHA
    b85a6a4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #236 from zerotier/brenton/fix-typos

    Fix typos and bump ZTO submodule commit to include Fix typos (https:/…
    joseph-henry authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    02dbc8f View commit details
    Browse the repository at this point in the history
  3. Fix: field '_lastRestart' will be initialized after field '_tcpFallba…

    …ckTunnel' [-Wreorder-ctor]
    bostick committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    6fe2d49 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aede837 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #238 from zerotier/brenton/fix-reorder-ctor

    Fix: field '_lastRestart' will be initialized after field '_tcpFallba…
    joseph-henry authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    928d08c View commit details
    Browse the repository at this point in the history
  6. Merge pull request #237 from zerotier/brenton/fix-switch

    Fix: warning: enumeration value 'TCP_HTTP_OUTGOING' not handled in sw…
    joseph-henry authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    f5eee8d View commit details
    Browse the repository at this point in the history
  7. Fix: Cannot resolve symbol 'localPort'

    Remove second bind() with unused backlog arg and identical impl as first
    bind()
    bostick committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    b4c7fd1 View commit details
    Browse the repository at this point in the history
  8. Fix: Incorrect type for parameter 'net_id', which should have type 'j…

    …long'.
    
    Incorrect return type uint64_t, which should have been jlong.
    Incorrect return type uint64_t, which should have been jlong.
    Incorrect return type uint64_t, which should have been jlong.
    bostick committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    8aa6890 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #240 from zerotier/brenton/fix-cannot-resolve-symbol

    Fix: Cannot resolve symbol 'localPort'
    joseph-henry authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    79636da View commit details
    Browse the repository at this point in the history
  10. Merge pull request #239 from zerotier/brenton/fix-incorrect-types

    Fix: Incorrect type for parameter 'net_id', which should have type 'j…
    joseph-henry authored Aug 2, 2023
    Configuration menu
    Copy the full SHA
    431c421 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Configuration menu
    Copy the full SHA
    dd0d606 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Fix #242

    When processing events, AttachCurrentThread is called, but matching
    DetachCurrentThread was not being called
    
    This prevented main thread from exiting
    bostick committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    dd45f9f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    624038d View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. fix examples warnings

    warning: incompatible pointer types passing 'int *' to parameter of type 'unsigned short *' [-Wincompatible-pointer-types]
    bostick committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    b1d088f View commit details
    Browse the repository at this point in the history
  2. fix formatting

    bostick committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    8480053 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    18a2c38 View commit details
    Browse the repository at this point in the history
  4. add ZTS_IN6ADDR_ANY_INIT and zts_in6addr_any

    These mimic IN6ADDR_ANY_INIT and in6addr_any
    
    For setting sin6_addr in zts_sockaddr_in6:
    ```
    struct zts_sockaddr_in6 addr6;
    addr6.sin6_addr = zts_in6addr_any;
    ```
    bostick committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    9ca6873 View commit details
    Browse the repository at this point in the history
  5. Remove debug optimization -O3

    This was running many optimization passes and preventing debugging
    bostick committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    29b2087 View commit details
    Browse the repository at this point in the history
  6. Fix fatal error: jni_md.h: No such file or directory

    And clean up finding JNI in general
    Tested on Mac, Linux, and Android
    bostick committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    1895767 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. Merge pull request #245 from zerotier/brenton/add-zts_in6addr_any

    add ZTS_IN6ADDR_ANY_INIT and zts_in6addr_any
    joseph-henry authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    67cdb59 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #246 from zerotier/brenton/jni-work

    Fix fatal error: jni_md.h: No such file or directory
    joseph-henry authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    d5ffe38 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #247 from zerotier/brenton/remove-debug-optimization

    Remove debug optimization -O3
    joseph-henry authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    b2d5e08 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #248 from zerotier/brenton/fix-redundant-cast

    Fix warning: [cast] redundant cast to int
    joseph-henry authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    2ec28b8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2a8670e View commit details
    Browse the repository at this point in the history
  6. Merge pull request #250 from zerotier/brenton/fix-examples-warnings

    fix examples warnings
    joseph-henry authored Aug 19, 2023
    Configuration menu
    Copy the full SHA
    f800bba View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. rename

    bostick committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    f5ffc06 View commit details
    Browse the repository at this point in the history
  2. Fix #244:

    Memory leak if libzt events aren't consumed by user app
    If arg is not enqueued by Events, then treat as if ownership has NOT
    been transferred and caller of Events->enqueue is responsible for freeing
    bostick committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    ee5047b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    af217eb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8a414d5 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #252 from zerotier/bugfix/211

    Fix #211: Use tcpip_input for IPv6 instead of ethernet_input
    joseph-henry authored Aug 21, 2023
    Configuration menu
    Copy the full SHA
    1bdced9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d12d43c View commit details
    Browse the repository at this point in the history