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

Conversation

joseph-henry
Copy link
Contributor

No description provided.

joseph-henry and others added 30 commits June 1, 2022 14:40
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>
…t/regex-1.5.6

Bump regex from 1.5.4 to 1.5.6 in /pkg/crate/libzt
upgrade gradle versions and include .cxx bindings
This adheres to standard Java style and fixes:
Package name 'com.zerotier.sockets' does not correspond to the file path ''

in Android Studio
Move java files to com/zerotier/sockets subfolder
fix: Incorrect type for parameter 'thisObj', which should have type '…
update various settings for Android and Gradle
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.
Fix warning about function never used
* 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 and others added 29 commits August 2, 2023 12:08
Fix: field '_lastRestart' will be initialized after field '_tcpFallba…
Fix: warning: enumeration value 'TCP_HTTP_OUTGOING' not handled in sw…
Remove second bind() with unused backlog arg and identical impl as first
bind()
…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.
Fix: Incorrect type for parameter 'net_id', which should have type 'j…
When processing events, AttachCurrentThread is called, but matching
DetachCurrentThread was not being called

This prevented main thread from exiting
warning: incompatible pointer types passing 'int *' to parameter of type 'unsigned short *' [-Wincompatible-pointer-types]
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;
```
This was running many optimization passes and preventing debugging
And clean up finding JNI in general
Tested on Mac, Linux, and Android
add ZTS_IN6ADDR_ANY_INIT and zts_in6addr_any
Fix fatal error: jni_md.h: No such file or directory
Fix warning: [cast] redundant cast to int
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
Fix #211: Use tcpip_input for IPv6 instead of ethernet_input
@joseph-henry joseph-henry merged commit 2aa7302 into main Aug 23, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants