Fix for espressif#3460 issue (espressif#4424)

igolubic · web-flow · commit d6b91872cb57 · 2020-11-02T18:59:03.000+02:00
Fixes: espressif#3460 This code has been run in production for 1 month and it looks stable, no data dropped and it definitely fixes the issue described. I think that this can be merged to avoid using custom package referencing in PlatformIO that has been used in quite a few projects for now. Co-authored-by: Ivan Golubic <ivan@mvt-solutions.com>
diff --git a/libraries/WiFiClientSecure/src/ssl_client.cpp b/libraries/WiFiClientSecure/src/ssl_client.cpp
@@ -284,24 +284,21 @@ int data_to_read(sslclient_context *ssl_client)
     return res;
 }
 
-
 int send_ssl_data(sslclient_context *ssl_client, const uint8_t *data, uint16_t len)
 {
-    log_v("Writing HTTP request...");  //for low level debug
+    log_v("Writing HTTP request with %d bytes...", len); //for low level debug
     int ret = -1;
 
-    while ((ret = mbedtls_ssl_write(&ssl_client->ssl_ctx, data, len)) <= 0) {
-        if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
-            return handle_error(ret);
-        }
+    if ((ret = mbedtls_ssl_write(&ssl_client->ssl_ctx, data, len)) <= 0){
+        log_v("Handling error %d", ret); //for low level debug
+        return handle_error(ret);
+    } else{
+        log_v("Returning with %d bytes written", ret); //for low level debug
     }
 
-    len = ret;
-    //log_v("%d bytes written", len);  //for low level debug
     return ret;
 }
 
-
 int get_ssl_receive(sslclient_context *ssl_client, uint8_t *data, int length)
 {
     //log_d( "Reading HTTP response...");   //for low level debug

Original file line number	Diff line number	Diff line change
`@@ -284,24 +284,21 @@ int data_to_read(sslclient_context *ssl_client)`
`284`	`284`	`return res;`
`285`	`285`	`}`
`286`	`286`
`287`		`-`
`288`	`287`	`int send_ssl_data(sslclient_context ssl_client, const uint8_t data, uint16_t len)`
`289`	`288`	`{`
`290`		`- log_v("Writing HTTP request..."); //for low level debug`
	`289`	`+ log_v("Writing HTTP request with %d bytes...", len); //for low level debug`
`291`	`290`	`int ret = -1;`
`292`	`291`
`293`		`- while ((ret = mbedtls_ssl_write(&ssl_client->ssl_ctx, data, len)) <= 0) {`
`294`		`- if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {`
`295`		`- return handle_error(ret);`
`296`		`- }`
	`292`	`+ if ((ret = mbedtls_ssl_write(&ssl_client->ssl_ctx, data, len)) <= 0){`
	`293`	`+ log_v("Handling error %d", ret); //for low level debug`
	`294`	`+ return handle_error(ret);`
	`295`	`+ } else{`
	`296`	`+ log_v("Returning with %d bytes written", ret); //for low level debug`
`297`	`297`	`}`
`298`	`298`
`299`		`- len = ret;`
`300`		`- //log_v("%d bytes written", len); //for low level debug`
`301`	`299`	`return ret;`
`302`	`300`	`}`
`303`	`301`
`304`		`-`
`305`	`302`	`int get_ssl_receive(sslclient_context ssl_client, uint8_t data, int length)`
`306`	`303`	`{`
`307`	`304`	`//log_d( "Reading HTTP response..."); //for low level debug`