Skip to content

WiFiClientSecure owns context, fix stopAllExcept #8136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 20, 2021
Merged

WiFiClientSecure owns context, fix stopAllExcept #8136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2b0178
WiFiClientSecure owns context, fix stopAllExcept
earlephilhower Jun 17, 2021
415e888
Reverse logic, use lowest-level Ctx for match
earlephilhower Jun 17, 2021
a79739d
Merge branch 'master' into ctx1
d-a-v Jun 17, 2021
62656cb
Merge branch 'master' into ctx1
earlephilhower Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions libraries/ESP8266WiFi/src/WiFiClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ WiFiClient* SList<WiFiClient>::_s_first = 0;


WiFiClient::WiFiClient()
: _client(0)
: _client(0), _owned(0)
{
_timeout = 5000;
WiFiClient::_add(this);
}

WiFiClient::WiFiClient(ClientContext* client)
: _client(client)
: _client(client), _owned(0)
{
_timeout = 5000;
_client->ref();
Expand All @@ -106,6 +106,7 @@ WiFiClient::WiFiClient(const WiFiClient& other)
_client = other._client;
_timeout = other._timeout;
_localPort = other._localPort;
_owned = other._owned;
if (_client)
_client->ref();
WiFiClient::_add(this);
Expand All @@ -118,6 +119,7 @@ WiFiClient& WiFiClient::operator=(const WiFiClient& other)
_client = other._client;
_timeout = other._timeout;
_localPort = other._localPort;
_owned = other._owned;
if (_client)
_client->ref();
return *this;
Expand Down Expand Up @@ -382,9 +384,18 @@ void WiFiClient::stopAll()

void WiFiClient::stopAllExcept(WiFiClient* except)
{
// Stop all will look at the lowest-level wrapper connections only
while (except->_owned) {
except = except->_owned;
}
for (WiFiClient* it = _s_first; it; it = it->_next) {
if (it != except) {
it->stop();
WiFiClient* conn = it;
// Find the lowest-level owner of the current list entry
while (conn->_owned) {
conn = conn->_owned;
}
if (conn != except) {
conn->stop();
}
}
}
Expand Down
1 change: 1 addition & 0 deletions libraries/ESP8266WiFi/src/WiFiClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class WiFiClient : public Client, public SList<WiFiClient> {
void _err(int8_t err);

ClientContext* _client;
WiFiClient* _owned;
static uint16_t _localPort;
};

Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ class WiFiClientSecure : public WiFiClient {

public:

WiFiClientSecure():_ctx(new WiFiClientSecureCtx()) { }
WiFiClientSecure(const WiFiClientSecure &rhs): WiFiClient(), _ctx(rhs._ctx) { }
WiFiClientSecure():_ctx(new WiFiClientSecureCtx()) { _owned = _ctx.get(); }
WiFiClientSecure(const WiFiClientSecure &rhs): WiFiClient(), _ctx(rhs._ctx) { if (_ctx) _owned = _ctx.get(); }
~WiFiClientSecure() override { _ctx = nullptr; }

WiFiClientSecure& operator=(const WiFiClientSecure&) = default; // The shared-ptrs handle themselves automatically
Expand Down