Skip to content

Don't return true with WiFiClientSecureBearSSL::connected() when really disconnected #8330

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
d-a-v merged 10 commits into from
Dec 16, 2022
Merged

Don't return true with WiFiClientSecureBearSSL::connected() when really disconnected #8330

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
724f1ca
Don't return `true` with WiFiClientSecureBearSSL::connected() when di…
mcspr Oct 7, 2021
8e8cbd2
notice about _updateRecvBuffer aka external available
mcspr Oct 7, 2021
934ab80
Merge remote-tracking branch 'origin/master' into secure-connected-me…
mcspr Feb 21, 2022
3eb7ab1
wip
mcspr Feb 25, 2022
0be8943
Merge remote-tracking branch 'origin/master' into secure-connected-me…
mcspr Jul 2, 2022
f65b157
restore available() for real
mcspr Jul 2, 2022
c541597
Merge branch 'master' into secure-connected-means-read-and-write
d-a-v Dec 14, 2022
f5e6534
direct call
mcspr Jul 4, 2022
5454375
oops
mcspr Dec 14, 2022
3e5500d
Merge branch 'master' into secure-connected-means-read-and-write
d-a-v Dec 16, 2022
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
Prev Previous commit
Next Next commit
restore available() for real
  • Loading branch information
@mcspr
mcspr committed Jul 2, 2022
commit f65b157a8742dbea41b1f1881f2e9eef984266bd
8 changes: 6 additions & 2 deletions libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,11 @@ void WiFiClientSecureCtx::_freeSSL() {
}

bool WiFiClientSecureCtx::_clientConnected() {
return _client && (_client->state() == ESTABLISHED);
if (!_client || (_client->state() == CLOSED)) {
return false;
}

return _client->state() == ESTABLISHED;
}

bool WiFiClientSecureCtx::_engineConnected() {
Expand All @@ -264,7 +268,7 @@ uint8_t WiFiClientSecureCtx::connected() {

_pollRecvBuffer();

return _engineConnected();
return _engineConnected() || (available() > 0);
}

int WiFiClientSecureCtx::availableForWrite () {
Expand Down