Make NUT OpenSSL dialogs more reliable#3351
Merged
jimklimov merged 2 commits intonetworkupstools:masterfrom Mar 20, 2026
Merged
Make NUT OpenSSL dialogs more reliable#3351jimklimov merged 2 commits intonetworkupstools:masterfrom
jimklimov merged 2 commits intonetworkupstools:masterfrom
Conversation
jimklimov
added
bug
Windows
SSL/NSS
…fall back from symlink to hardlink to copy [networkupstools#1711] Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
|
✅ Build nut 2.8.4.4331-master completed (commit 6b889c283f by @jimklimov) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Follow-up to #3344, this PR applies similar logic of retrying (in case of
SSL_ERROR_WANT_WRITEorSSL_ERROR_WANT_READreturn codes) to read and write commands during the normal protocol dialog, not just during handshake.Without this,
make check-NITfailed on Windows at least with OpenSSL builds -upscestablished the connection but failed actual queries (possibly it broke at the moment of sending/reading the"OK STARTTLS"confirmation). Apparently it fared better on all other NUT CI farm systems, regardless of their performance (some builders are co-located on quite congested hosts).CC @clepple : this picks up the trick from your
ssl_accept_nbiobranch, ofreturn 0fromssl_error()methods in case of these retryable return codes. The rest of non-blockable support (is it needed or not, toxic or not, after progress made in recent PRs) remains questionable to me. For some clarity, I'll bump thessl_accept_nbio_v285branch after merging this PR (if it passes) to see how it fares in CI.Also FYI CC @aquette - with this, SSL support should be at least functional on various platforms. Previously much of it happened to work if conditions were just right, and crashed elsewhere. Converging OpenSSL and NSS code to behave similarly, so it is a preference and not a choice driven by technical constraints, is a separate matter (#3331).