Merge branch 'erase_flash' of https://github.com/PilnyTomas/arduino-esp32 into pr/7043

Author: P-R-O-C-H-Y

libraries/WiFi/src/WiFiClient.cpp

@@ -305,20 +305,21 @@ int WiFiClient::connect(const char *host, uint16_t port, int32_t timeout)
 
 int WiFiClient::setSocketOption(int option, char* value, size_t len)
 {
-    int res = setsockopt(fd(), SOL_SOCKET, option, value, len);
+    return setSocketOption(SOL_SOCKET, option, (const void*)value, len);
+}
+
+int WiFiClient::setSocketOption(int level, int option, const void* value, size_t len)
+{
+    int res = setsockopt(fd(), level, option, value, len);
     if(res < 0) {
-        log_e("%X : %d", option, errno);
+        log_e("fail on %d, errno: %d, \"%s\"", fd(), errno, strerror(errno));
     }
     return res;
 }
 
 int WiFiClient::setOption(int option, int *value)
 {
-    int res = setsockopt(fd(), IPPROTO_TCP, option, (char *) value, sizeof(int));
-    if(res < 0) {
-        log_e("fail on fd %d, errno: %d, \"%s\"", fd(), errno, strerror(errno));
-    }
-    return res;
+    return setSocketOption(IPPROTO_TCP, option, (const void*)value, sizeof(int));
 }
 
 int WiFiClient::getOption(int option, int *value)

libraries/WiFi/src/WiFiClient.h

@@ -88,6 +88,7 @@ class WiFiClient : public ESPLwIPClient
     int fd() const;
 
     int setSocketOption(int option, char* value, size_t len);
+    int setSocketOption(int level, int option, const void* value, size_t len);
     int setOption(int option, int *value);
     int getOption(int option, int *value);
     int setNoDelay(bool nodelay);

libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

@@ -389,9 +389,14 @@ void WiFiClientSecure::setAlpnProtocols(const char **alpn_protos)
 
 int WiFiClientSecure::setSocketOption(int option, char* value, size_t len)
 {
-    int res = setsockopt(sslclient->socket, SOL_SOCKET, option, value, len);
+    return setSocketOption(SOL_SOCKET, option, (const void*)value, len);
+}
+
+int WiFiClientSecure::setSocketOption(int level, int option, const void* value, size_t len)
+{
+    int res = setsockopt(sslclient->socket, level, option, value, len);
     if(res < 0) {
-        log_e("%X : %d", option, errno);
+        log_e("fail on %d, errno: %d, \"%s\"", sslclient->socket, errno, strerror(errno));
     }
     return res;
 }

libraries/WiFiClientSecure/src/WiFiClientSecure.h

@@ -80,6 +80,7 @@ class WiFiClientSecure : public WiFiClient
     const mbedtls_x509_crt* getPeerCertificate() { return mbedtls_ssl_get_peer_cert(&sslclient->ssl_ctx); };
     bool getFingerprintSHA256(uint8_t sha256_result[32]) { return get_peer_fingerprint(sslclient, sha256_result); };
     int setSocketOption(int option, char* value, size_t len);
+    int setSocketOption(int level, int option, const void* value, size_t len);
 
     operator bool()
     {