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.

Sign up for GitHub

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

Jump to bottom

1.10.4 merge into main #1893

Merged
merged 85 commits into from
Mar 7, 2023
Merged

1.10.4 merge into main #1893

merged 85 commits into from
Mar 7, 2023

Conversation

adamierymenko
Copy link
Contributor

No description provided.

laduke and others added 30 commits February 21, 2023 09:15
@laduke
add note about forceTcpRelay
67cf4c4
@glimberg
Merge branch 'main' into dev
9124b0a
@laduke
Create a sample systemd unit for tcp proxy
dc54e0e
@glimberg
set gitattributes for rust & cargo so hashes dont conflict on Windows
032dc5c
@glimberg
Revert "set gitattributes for rust & cargo so hashes dont conflict on…
047e327 
… Windows"

This reverts commit 032dc5c.
@glimberg
Turn off autocrlf for rust source
936dda4 
Doesn't appear to play nice well when it comes to git and vendored cargo package hashes
@glimberg
Fix #1883 (#1886)
6cf3b65 
Still unknown as to why, but the call to `nc->GetProperties()` can fail
when setting a friendly name on the Windows virtual ethernet adapter.
Ensure that `ncp` is not null before continuing and accessing the device
GUID.
@glimberg
Don't vendor packages for zeroidc (#1885)
672c58b
@leleobhz
Added docker environment way to join networks (#1871)
c6adfd9
@bostick
add StringUtils
58e3b8c
@bostick
fix headers
216ed8c 
use recommended headers and remove unused headers
@bostick
move extern "C"
0733af5 
only JNI functions need to be exported
@bostick
cleanup
5be92a9
@bostick
fix ANDROID-50: RESULT_ERROR_BAD_PARAMETER typo
87edbb2
@bostick
fix typo in log message
0027e6b
@bostick
fix typos in JNI method signatures
1c88037
@bostick
fix typo
bfe4bc2
@bostick
fix ANDROID-51: fieldName is uninitialized
0100361
@bostick
fix ANDROID-35: memory leak
dd1b52c
@bostick
fix missing DeleteLocalRef in loops
703f929
@bostick
update to use unique error codes
21264ba
@bostick
add GETENV macro
8373a0f
@bostick
add LOG_TAG defines
71fc0dd
@bostick
ANDROID-48: add ZT_jnicache.cpp
7890185
@bostick
ANDROID-48: use ZT_jnicache.cpp and remove ZT_jnilookup.cpp and ZT_jn…
82749e4 
…iarray.cpp
@bostick
add Event.fromInt
7c5f256
@bostick
add PeerRole.fromInt
056cef7
@bostick
add ResultCode.fromInt
34ff813
@bostick
fix ANDROID-36: issues with ResultCode
acd8b95
@bostick
add VirtualNetworkConfigOperation.fromInt
7c27660
bostick and others added 28 commits March 2, 2023 07:19
@bostick
make VirtualNetworkRoute a plain data class
809022b
@bostick
add isSocketAddressEmpty
40d5f9b
@bostick
add addressPort
30cfe65
@bostick
add fromSocketAddressObject
4ee73fa
@bostick
invert logic in a couple of places and return early
e1c16a8
@bostick
newInetAddress and newInetSocketAddress work
132bff2 
allow newInetSocketAddress to return NULL if given empty address
@bostick
fix ANDROID-38: stack corruption in onSendPacketRequested
0a925a6
@bostick
use GETENV macro
d28f443
@bostick
JniRef work
a2f7539 
JniRef does not use callbacks struct, so remove
fix NewGlobalRef / DeleteGlobalRef mismatch
@bostick
use PRId64 macros
a1bf139
@bostick
switch statement work
914b4fa
@bostick
comments and logging
fbd8347
@bostick
Modifier 'public' is redundant for interface members
ca73651
@bostick
NodeException can be made a checked Exception
33a9cd0
@bostick
'NodeException' does not define a 'serialVersionUID' field
5b5625a
@bostick
'finalize()' should not be overridden
1ab36d8 
this is fine to do because ZeroTierOneService calls close() when it is done
@bostick
error handling, error reporting, asserts, logging
0aa4a4b
@bostick
simplify loadLibrary
7f996ea
@bostick
rename Node.networks -> Node.networkConfigs
8d74d34
@glimberg
Windows file permissions fix (#1887)
cc4251c
@laduke @someara @glimberg
Allow macOS interfaces to use multiple IP addresses (#1879)
9d5b9ef 
Co-authored-by: Sean OMeara <[email protected]>
Co-authored-by: Grant Limberg <[email protected]>
@joseph-henry @glimberg
Fix condition where full HELLOs might not be sent when necessary (#1877)
40705ca 
Co-authored-by: Grant Limberg <[email protected]>
@adamierymenko
1.10.4 version bumps
9f5bf06
@glimberg
Add security policy to repo (#1889)
a1af94f
@Keylost
[+] add e2k64 arch (#1890)
eedf270
@bostick
temp fix for ANDROID-56: crash inside newNetworkConfig from too many …
dd627cd 
…args
@adamierymenko
1.10.4 release notes
9fb3f04
@adamierymenko
Merge branch 'dev' of github.com:/zerotier/ZeroTierOne into dev
64423f3
@adamierymenko adamierymenko merged commit 1c58978 into main Mar 7, 2023
@leleobhz
Copy link
Contributor

Hello! @adamierymenko

Do you mind trigger Docker build to reflect #1871 ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@adamierymenko @leleobhz @laduke @glimberg @bostick @joseph-henry @Keylost