fix: Respecting connection timeout in WiFiClientSecure#5418
Merged
me-no-dev merged 1 commit intoespressif:masterfrom Jul 21, 2021
Merged
fix: Respecting connection timeout in WiFiClientSecure#5418me-no-dev merged 1 commit intoespressif:masterfrom
me-no-dev merged 1 commit intoespressif:masterfrom
Conversation
a087d47 to
da3cb81
Compare
Member
|
@david-cermak could you please have a look? |
david-cermak
approved these changes
Jul 20, 2021
Contributor
david-cermak
left a comment
There was a problem hiding this comment.
LGTM! Yes, the correct way of handling connection timeout is to set the socket to the non-blocking mode and select() on its writeability.
Some consistency comments:
- the code uses both
lwip_...prefixed API (lwip-connect), as well as the standard posix likeselect()orclose(). The former is faster, the latter is useful when writing generic code (e.g. with VFS), but in general better to stick to one API. On the other hand, this seems to be in line with theWiFiClient::connect, so it is consistent. lwip_connect_r()was an old re-entrant function variant in older IDF's, but in all currently supported versions, the socket API is fully reentrant and thread safe.- As a side note: we typically switch the socket back to the blocking mode, after connect, so standard
SO_RCVTIMEOandSO_SNDTIMEOoptions make sense, but this is in line with the previous code, as the socket was left in the non-blocking mode previously as well.
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
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.
Closes #5398
Using the same non-blocking socket connect pattern for respecting connection timeout, copied from WiFiClient::connect.
WiFiClient::connectuseslwip_connect_r, whereas start_ssl_client useslwip_connect. I haven't found what is the difference between them. I tested both, both work ok, so I keptlwip_connect.