Configurable WiFiClientSecure connect timeout, better default value (#4027)

igrr · devyte · commit fac64900dd1d · 2017-12-26T14:01:28.000-03:00
* WiFiClientSecure: use _timeout setting when connecting This timeout value can be customized via a call to setTimeout function. Closes #3944. * WiFiClientSecure: increase default connection timeout to 15 sec
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
@@ -404,6 +404,8 @@ ClientContext* SSLContext::s_io_ctx = nullptr;
 
 WiFiClientSecure::WiFiClientSecure()
 {
+    // TLS handshake may take more than the 5 second default timeout
+    _timeout = 15000;
 }
 
 WiFiClientSecure::~WiFiClientSecure()
@@ -459,7 +461,7 @@ int WiFiClientSecure::_connectSSL(const char* hostName)
         _ssl = new SSLContext;
         _ssl->ref();
     }
-    _ssl->connect(_client, hostName, 5000);
+    _ssl->connect(_client, hostName, _timeout);
 
     auto status = ssl_handshake_status(*_ssl);
     if (status != SSL_OK) {

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,8 @@ ClientContext* SSLContext::s_io_ctx = nullptr;`
`404`	`404`
`405`	`405`	`WiFiClientSecure::WiFiClientSecure()`
`406`	`406`	`{`
	`407`	`+ // TLS handshake may take more than the 5 second default timeout`
	`408`	`+ _timeout = 15000;`
`407`	`409`	`}`
`408`	`410`
`409`	`411`	`WiFiClientSecure::~WiFiClientSecure()`
`@@ -459,7 +461,7 @@ int WiFiClientSecure::_connectSSL(const char* hostName)`
`459`	`461`	`_ssl = new SSLContext;`
`460`	`462`	`_ssl->ref();`
`461`	`463`	`}`
`462`		`- _ssl->connect(_client, hostName, 5000);`
	`464`	`+ _ssl->connect(_client, hostName, _timeout);`
`463`	`465`
`464`	`466`	`auto status = ssl_handshake_status(*_ssl);`
`465`	`467`	`if (status != SSL_OK) {`