Fix HTTP Client with SSL (#3216)

me-no-dev · web-flow · commit 4ce2cc3c1d1e · 2019-09-16T19:14:32.000+03:00
diff --git a/libraries/WiFi/src/WiFiClient.h b/libraries/WiFi/src/WiFiClient.h
@@ -28,7 +28,15 @@
 class WiFiClientSocketHandle;
 class WiFiClientRxBuffer;
 
-class WiFiClient : public Client
+class ESPLwIPClient : public Client
+{
+public:
+        virtual int connect(IPAddress ip, uint16_t port, int32_t timeout) = 0;
+        virtual int connect(const char *host, uint16_t port, int32_t timeout) = 0;
+        virtual int setTimeout(uint32_t seconds) = 0;
+};
+
+class WiFiClient : public ESPLwIPClient
 {
 protected:
     std::shared_ptr<WiFiClientSocketHandle> clientSocketHandle;
diff --git a/libraries/WiFiClientSecure/src/WiFiClientSecure.h b/libraries/WiFiClientSecure/src/WiFiClientSecure.h
@@ -72,6 +72,8 @@ class WiFiClientSecure : public WiFiClient
     bool verify(const char* fingerprint, const char* domain_name);
     void setHandshakeTimeout(unsigned long handshake_timeout);
 
+    int setTimeout(uint32_t seconds){ return 0; }
+
     operator bool()
     {
         return connected();
diff --git a/libraries/WiFiClientSecure/src/ssl_client.cpp b/libraries/WiFiClientSecure/src/ssl_client.cpp
@@ -22,20 +22,23 @@
 
 const char *pers = "esp32-tls";
 
-static int handle_error(int err)
+static int _handle_error(int err, const char * file, int line)
 {
     if(err == -30848){
         return err;
     }
 #ifdef MBEDTLS_ERROR_C
     char error_buf[100];
     mbedtls_strerror(err, error_buf, 100);
-    log_e("%s", error_buf);
+    log_e("[%s():%d]: (%d) %s", file, line, err, error_buf);
+#else
+    log_e("[%s():%d]: code %d", file, line, err);
 #endif
-    log_e("MbedTLS message code: %d", err);
     return err;
 }
 
+#define handle_error(e) _handle_error(e, __FUNCTION__, __LINE__)
+
 
 void ssl_init(sslclient_context *ssl_client)
 {

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ class WiFiClientSecure : public WiFiClient`
`72`	`72`	`bool verify(const char* fingerprint, const char* domain_name);`
`73`	`73`	`void setHandshakeTimeout(unsigned long handshake_timeout);`
`74`	`74`
	`75`	`+ int setTimeout(uint32_t seconds){ return 0; }`
	`76`	`+`
`75`	`77`	`operator bool()`
`76`	`78`	`{`
`77`	`79`	`return connected();`
Original file line number	Diff line number	Diff line change
`@@ -22,20 +22,23 @@`
`22`	`22`
`23`	`23`	`const char *pers = "esp32-tls";`
`24`	`24`
`25`		`-static int handle_error(int err)`
	`25`	`+static int _handle_error(int err, const char * file, int line)`
`26`	`26`	`{`
`27`	`27`	`if(err == -30848){`
`28`	`28`	`return err;`
`29`	`29`	`}`
`30`	`30`	`#ifdef MBEDTLS_ERROR_C`
`31`	`31`	`char error_buf[100];`
`32`	`32`	`mbedtls_strerror(err, error_buf, 100);`
`33`		`- log_e("%s", error_buf);`
	`33`	`+ log_e("[%s():%d]: (%d) %s", file, line, err, error_buf);`
	`34`	`+#else`
	`35`	`+ log_e("[%s():%d]: code %d", file, line, err);`
`34`	`36`	`#endif`
`35`		`- log_e("MbedTLS message code: %d", err);`
`36`	`37`	`return err;`
`37`	`38`	`}`
`38`	`39`
	`40`	`+#define handle_error(e) _handle_error(e, __FUNCTION__, __LINE__)`
	`41`	`+`
`39`	`42`
`40`	`43`	`void ssl_init(sslclient_context *ssl_client)`
`41`	`44`	`{`