Skip to content

Remove deadlock when server is not acking our data #6107

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 7 commits into from
May 19, 2019
Merged

Remove deadlock when server is not acking our data #6107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6e1360
Use bounded waiting instead of infinite one to avoid deadlock
dsislak May 17, 2019
5665aa6
Reduce timeout to fail much sooner if server is not acking our data
dsislak May 17, 2019
c14a34a
Return timeout to 15 seconds on every disconnect
dsislak May 17, 2019
6b21c03
Merge branch 'master' into bufix_deadlock_not_responsive_server
sislakd May 19, 2019
c2b9cf9
Add comment to introduced delay to make it super clear
dsislak May 19, 2019
12bc70e
Merge branch 'master' into bufix_deadlock_not_responsive_server
earlephilhower May 19, 2019
8583246
Merge branch 'master' into bufix_deadlock_not_responsive_server
earlephilhower May 19, 2019
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
4 changes: 4 additions & 0 deletions libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ void WiFiClientSecure::_freeSSL() {
_recvapp_len = 0;
// This connection is toast
_handshake_done = false;
_timeout = 15000;
}

bool WiFiClientSecure::_clientConnected() {
Expand Down Expand Up @@ -1009,6 +1010,9 @@ bool WiFiClientSecure::_connectSSL(const char* hostName) {
_x509_insecure = nullptr;
_x509_knownkey = nullptr;

// reduce timeout after successful handshake to fail fast if server stop accepting our data for whathever reason
if (ret) _timeout = 5000;

return ret;
}

Expand Down
3 changes: 2 additions & 1 deletion libraries/ESP8266WiFi/src/include/ClientContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,8 @@ class ClientContext
}

_send_waiting = true;
esp_yield();
// This delay will be interrupted by esp_schedule on next received ack
delay(_timeout_ms);
} while(true);
_send_waiting = false;

Expand Down