Fix natpmp request issue on Windows #2561
Open
+0
−4
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.
When compiling ZeroTierOne with
MSVC140, theEWOULDBLOCKmacro is defined as140inerrno.hby default, whileWSAEWOULDBLOCKis defined as10035inwinsock2.h. According to the current code,EWOULDBLOCKultimately resolves to140. WhenWSAGetLastError()is used later, the timeout return value is10035, so it is not handled correctly by the existing logic.ZeroTierOne/ext/libnatpmp/natpmp.c
Lines 214 to 228 in 8d4cb1e
As a result, when ZeroTierOne encounters an intermittent timeout from the NAT-PMP service, it immediately tries the next
tryPortinstead of continuing to retry on the currenttryPortfor up to 10 seconds as expected.ZeroTierOne/osdep/PortMapper.cpp
Lines 152 to 164 in 8d4cb1e
This PR redefines
EWOULDBLOCKtoWSAEWOULDBLOCK(i.e.,10035) so that ZeroTierOne can correctly handle NAT-PMP service timeout events.