fix: ClientSecure.available() fix for connection closed by remote socket (#9869)

JAndrassy · web-flow · commit 5c22402025cc · 2024-06-17T22:40:10.000+03:00
diff --git a/libraries/NetworkClientSecure/src/NetworkClientSecure.cpp b/libraries/NetworkClientSecure/src/NetworkClientSecure.cpp
@@ -305,9 +305,11 @@ int NetworkClientSecure::available() {
   res = data_to_read(sslclient.get());
 
   if (res < 0 && !_stillinPlainStart) {
-    log_e("Closing connection on failed available check");
+    if (res != MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
+      log_e("Closing connection on failed available check");
+    }
     stop();
-    return peeked ? peeked : res;
+    return peeked;
   }
   return res + peeked;
 }
diff --git a/libraries/NetworkClientSecure/src/ssl_client.cpp b/libraries/NetworkClientSecure/src/ssl_client.cpp
@@ -27,7 +27,7 @@
 const char *pers = "esp32-tls";
 
 static int _handle_error(int err, const char *function, int line) {
-  if (err == -30848) {
+  if (err == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
     return err;
   }
 #ifdef MBEDTLS_ERROR_C

Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,11 @@ int NetworkClientSecure::available() {`
`305`	`305`	`res = data_to_read(sslclient.get());`
`306`	`306`
`307`	`307`	`if (res < 0 && !_stillinPlainStart) {`
`308`		`- log_e("Closing connection on failed available check");`
	`308`	`+ if (res != MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {`
	`309`	`+ log_e("Closing connection on failed available check");`
	`310`	`+ }`
`309`	`311`	`stop();`
`310`		`- return peeked ? peeked : res;`
	`312`	`+ return peeked;`
`311`	`313`	`}`
`312`	`314`	`return res + peeked;`
`313`	`315`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`const char *pers = "esp32-tls";`
`28`	`28`
`29`	`29`	`static int _handle_error(int err, const char *function, int line) {`
`30`		`- if (err == -30848) {`
	`30`	`+ if (err == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {`
`31`	`31`	`return err;`
`32`	`32`	`}`
`33`	`33`	`#ifdef MBEDTLS_ERROR_C`