Fix setsockopt incompatible pointer type error on Windows with GCC 14+ #4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add some padding after non-ASCII comment
add `make docker-release` command & update dockerfile
regarding zerotier#2361
Fix build error under certain character sets in Windows
When building via `make core` to make libzerotiercore.a, you can't link unless OSUtils.cpp is also built & linked.
Move osutils/OSUtils.o into CORE_OBJS
Lower ZT_MIN_PHYSMTU
Build fix for OpenBSD - See ticket zerotier#2397
Bumps [rustls](https://github.com/rustls/rustls) from 0.23.15 to 0.23.18. - [Release notes](https://github.com/rustls/rustls/releases) - [Changelog](https://github.com/rustls/rustls/blob/main/CHANGELOG.md) - [Commits](rustls/rustls@v/0.23.15...v/0.23.18) --- updated-dependencies: - dependency-name: rustls dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…bits/rustls-0.23.18 Bump rustls from 0.23.15 to 0.23.18 in /rustybits
update rust dependencies
V1.16 kitchen sink branch, 1.16 ready.
Dev main merge
… into update-readme
…build Fix debian controller build
Drastically shortened main readme and linked out to build notes instead. Clarified licensing info to just match license.txt.
… into update-readme
Shorten/clean README.md. Split README into a few separate, including BUILD. Correctly references licensing information.
_enabled is set to true by setUpPostDecodeReceiveThreads(), so disabled until then, but the constructor wasn't initializing it. _concurrency is not being used before being set but for safety's sake, ensure it has a starting value as well. Also, remove the vestigial _rxThreadCount, which is no longer used.
Ensure members in PacketMultiplexer are initialized
StephenCWills
approved these changes
Nov 29, 2025
Member
StephenCWills
left a comment
StephenCWills
left a comment
There was a problem hiding this comment.
Looks good, but it feels like we should be sending this upstream.
StephenCWills
force-pushed
the
fix/mingw-setsockopt-gcc14
branch
2 times, most recently
from
51288c3 to
eb56c9f
Compare
Member
|
Rebased onto the |
Author
Agreed, going to file a PR there too. |
…C 14+
GCC 14+ treats -Wincompatible-pointer-types as an error by default.
On Windows, setsockopt() expects const char* for the option value, and
socket timeouts (SO_RCVTIMEO/SO_SNDTIMEO) use DWORD (milliseconds)
instead of struct timeval.
This was also a latent bug: the original code passed a struct timeval
(8 bytes: {tv_sec=3, tv_usec=0}) but Windows expects a DWORD (4 bytes)
containing milliseconds. Windows would read only the first 4 bytes
(value 3) as 3 milliseconds instead of the intended 3 seconds.
skypher
force-pushed
the
fix/mingw-setsockopt-gcc14
branch
from
eb56c9f to
0ca24aa
Compare
Author
|
Upstream PR: zerotier#2542 |
Author
Are we good to merge here or should I finish resolving the conflicts? |
Member
|
It's not possible to merge without resolving conflicts. Also, if these new commits are from upstream, we should probably consider creating a separate PR or even rebasing our commits on a new branch instead of pulling them into this PR. Lastly, I noticed you opened a PR with https://github.com/zerotier/ZeroTierOne, but they've actually pulled in miniupnpc from https://github.com/miniupnp/miniupnp. It looks like that project is still active as of three months ago so you might want to also submit your fix there. |
Author
|
Let's wait a bit to get feedback from upstream. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
GCC 14+ treats
-Wincompatible-pointer-typesas an error by default. On Windows,setsockopt()expectsconst char*for the option value, and socket timeouts (SO_RCVTIMEO/SO_SNDTIMEO) useDWORD(milliseconds) instead ofstruct timeval.This PR fixes the miniupnpc
connecthostport.cto use the correct types on Windows:DWORDinstead ofstruct timevalfor the timeout variable(const char *)when callingsetsockopt()Note: This was a latent bug
The original code was actually broken on Windows, not just a type mismatch. The code passed a
struct timeval(8 bytes:{tv_sec=3, tv_usec=0}) but Windows expects aDWORD(4 bytes) containing milliseconds.Windows would read only the first 4 bytes (value
3) as 3 milliseconds instead of the intended 3 seconds. The code appeared to work because connections usually succeeded before the tiny 3ms timeout kicked in, and older GCC versions only warned about the pointer type mismatch rather than erroring.Test plan