From 4e059d94ede0f0c1174d038924d02ec0a5191833 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 13 Jun 2017 10:41:18 +0200 Subject: [PATCH 1/2] Added String hostname support to WiFiClient and WiFiClientSecure --- libraries/ESP8266WiFi/src/WiFiClient.cpp | 5 +++++ libraries/ESP8266WiFi/src/WiFiClient.h | 1 + libraries/ESP8266WiFi/src/WiFiClientSecure.cpp | 5 +++++ libraries/ESP8266WiFi/src/WiFiClientSecure.h | 1 + 4 files changed, 12 insertions(+) diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp index 576201c684..776c2dbeee 100644 --- a/libraries/ESP8266WiFi/src/WiFiClient.cpp +++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp @@ -102,6 +102,11 @@ int WiFiClient::connect(const char* host, uint16_t port) return 0; } +int WifiClient::connect(const String host, uint16_t port) +{ + return connect(host.c_str(), port); +} + int WiFiClient::connect(IPAddress ip, uint16_t port) { ip_addr_t addr; diff --git a/libraries/ESP8266WiFi/src/WiFiClient.h b/libraries/ESP8266WiFi/src/WiFiClient.h index cb4f75c37b..10204a705d 100644 --- a/libraries/ESP8266WiFi/src/WiFiClient.h +++ b/libraries/ESP8266WiFi/src/WiFiClient.h @@ -46,6 +46,7 @@ class WiFiClient : public Client, public SList { uint8_t status(); virtual int connect(IPAddress ip, uint16_t port); virtual int connect(const char *host, uint16_t port); + virtual int connect(const String host, uint16_t port); virtual size_t write(uint8_t); virtual size_t write(const uint8_t *buf, size_t size); size_t write_P(PGM_P buf, size_t size); diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp index 88c401661c..3679b899f9 100644 --- a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp +++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp @@ -318,6 +318,11 @@ int WiFiClientSecure::connect(const char* name, uint16_t port) return _connectSSL(name); } +int WifiClientSecure::connect(const String host, uint16_t port) +{ + return connect(host.c_str(), port); +} + int WiFiClientSecure::_connectSSL(const char* hostName) { if (!_ssl) { diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.h b/libraries/ESP8266WiFi/src/WiFiClientSecure.h index 4b5b9c9343..26facf050e 100644 --- a/libraries/ESP8266WiFi/src/WiFiClientSecure.h +++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.h @@ -36,6 +36,7 @@ class WiFiClientSecure : public WiFiClient { WiFiClientSecure& operator=(const WiFiClientSecure&); int connect(IPAddress ip, uint16_t port) override; + int connect(const String host, uint16_t port) override; int connect(const char* name, uint16_t port) override; bool verify(const char* fingerprint, const char* domain_name); From 83d7e116f2f3bcbbbc1b7a90ebc5005bfda77db9 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Tue, 13 Jun 2017 10:54:51 +0200 Subject: [PATCH 2/2] Typo in WiFi --- libraries/ESP8266WiFi/src/WiFiClient.cpp | 2 +- libraries/ESP8266WiFi/src/WiFiClientSecure.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp index 776c2dbeee..78df8f74cd 100644 --- a/libraries/ESP8266WiFi/src/WiFiClient.cpp +++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp @@ -102,7 +102,7 @@ int WiFiClient::connect(const char* host, uint16_t port) return 0; } -int WifiClient::connect(const String host, uint16_t port) +int WiFiClient::connect(const String host, uint16_t port) { return connect(host.c_str(), port); } diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp index 3679b899f9..3ad25a1830 100644 --- a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp +++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp @@ -318,7 +318,7 @@ int WiFiClientSecure::connect(const char* name, uint16_t port) return _connectSSL(name); } -int WifiClientSecure::connect(const String host, uint16_t port) +int WiFiClientSecure::connect(const String host, uint16_t port) { return connect(host.c_str(), port); }