Remove deadlock when server is not acking our data (esp8266#6107)

sislakd · d-a-v · commit 912c0db09107 · 2019-05-19T22:38:24.000+02:00
* Use bounded waiting instead of infinite one to avoid deadlock

* Reduce timeout to fail much sooner if server is not acking our data

* Return timeout to 15 seconds on every disconnect

* Add comment to introduced delay to make it super clear
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
@@ -248,6 +248,7 @@ void WiFiClientSecure::_freeSSL() {
   _recvapp_len = 0;
   // This connection is toast
   _handshake_done = false;
+  _timeout = 15000;
 }
 
 bool WiFiClientSecure::_clientConnected() {
@@ -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;
 }
 
diff --git a/libraries/ESP8266WiFi/src/include/ClientContext.h b/libraries/ESP8266WiFi/src/include/ClientContext.h
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ void WiFiClientSecure::_freeSSL() {`
`248`	`248`	`_recvapp_len = 0;`
`249`	`249`	`// This connection is toast`
`250`	`250`	`_handshake_done = false;`
	`251`	`+ _timeout = 15000;`
`251`	`252`	`}`
`252`	`253`
`253`	`254`	`bool WiFiClientSecure::_clientConnected() {`
`@@ -1009,6 +1010,9 @@ bool WiFiClientSecure::_connectSSL(const char* hostName) {`
`1009`	`1010`	`_x509_insecure = nullptr;`
`1010`	`1011`	`_x509_knownkey = nullptr;`
`1011`	`1012`
	`1013`	`+ // reduce timeout after successful handshake to fail fast if server stop accepting our data for whathever reason`
	`1014`	`+ if (ret) _timeout = 5000;`
	`1015`	`+`
`1012`	`1016`	`return ret;`
`1013`	`1017`	`}`
`1014`	`1018`
Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,8 @@ class ClientContext`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`_send_waiting = true;`
`459`		`- esp_yield();`
	`459`	`+ // This delay will be interrupted by esp_schedule on next received ack`
	`460`	`+ delay(_timeout_ms);`
`460`	`461`	`} while(true);`
`461`	`462`	`_send_waiting = false;`
`462`	`463`