WiFiClientSecure owns context, fix stopAllExcept#8136
Merged
earlephilhower merged 4 commits intoesp8266:masterfrom Jun 20, 2021
Merged
WiFiClientSecure owns context, fix stopAllExcept#8136earlephilhower merged 4 commits intoesp8266:masterfrom
earlephilhower merged 4 commits intoesp8266:masterfrom
Conversation
Fixes esp8266#8079 Because WiFiClientSecure inherits WiFiClient, and WiFiClientSecureCtx also inherits WiFiClient, they both end up in the list of TCP connections that are used for WiFiClient::stopAllExcept(). This would cause the underlying SSL connection to be closed whenever you attempted to stopAllExcept(WiFiClientSecure) Fix by adding a "_owner" pointer in the WiFiClient object which points to nullptr (default case) or to the associated upper-layer connection. When stopping all connections except one, only look at the uppermost connections.
Collaborator
Author
|
@d-a-v, I think I need to reverse the sense here and look at the lowest-level, not uppermost one. So hold off on any review or merge, please. |
Because there may be multiple copies of the WiFiClientSecure, but only a single WiFiClientCtx, use the Ctx to check for relatedness on connections. This will avoid closing SSL connections that were assignment copies.
Collaborator
Author
|
Okay, good to go @d-a-v. Logic reversed and tested locally. |
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.
Fixes #8079
Because WiFiClientSecure inherits WiFiClient, and WiFiClientSecureCtx also
inherits WiFiClient, they both end up in the list of TCP connections that
are used for WiFiClient::stopAllExcept(). This would cause the underlying
SSL connection to be closed whenever you attempted to
stopAllExcept(WiFiClientSecure)
Fix by adding a "_owner" pointer in the WiFiClient object which points to
nullptr (default case) or to the associated upper-layer connection.
When stopping all connections except one, only look at the uppermost
connections.