From a2789df2a5294c3205230f5a76361f68debd19a1 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 17 Nov 2015 03:13:37 +0300 Subject: [PATCH] ESP8266httpUpdate: add method overload to allow updates using WiFiClientSecure --- libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp | 8 +++++--- libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp index 85dafa45f..33907465c 100644 --- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp +++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp @@ -34,17 +34,19 @@ ESP8266HTTPUpdate::~ESP8266HTTPUpdate(void) { } t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port, const char * url, const char * current_version) { - - t_httpUpdate_return ret = HTTP_UPDATE_FAILED; WiFiClient tcp; DEBUG_HTTP_UPDATE("[httpUpdate] connected to %s:%u %s .... ", host, port, url); if(!tcp.connect(host, port)) { DEBUG_HTTP_UPDATE("failed.\n"); - return ret; + return HTTP_UPDATE_FAILED; } DEBUG_HTTP_UPDATE("ok.\n"); + return update(tcp, host, url, current_version); +} +t_httpUpdate_return ESP8266HTTPUpdate::update(WiFiClient& tcp, const char* host, const char* url, const char * current_version) { + t_httpUpdate_return ret = HTTP_UPDATE_FAILED; // set Timeout for readBytesUntil and readStringUntil tcp.setTimeout(2000); tcp.setNoDelay(true); diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h index 334b0e43c..3f72bc98e 100644 --- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h +++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h @@ -50,6 +50,7 @@ class ESP8266HTTPUpdate { t_httpUpdate_return update(const char * host, uint16_t port, const char * url = "/", const char * current_version = ""); t_httpUpdate_return update(String host, uint16_t port, String url = "/", String current_version = ""); + t_httpUpdate_return update(WiFiClient& client, const char* host, const char* url = "/", const char * current_version = ""); }; extern ESP8266HTTPUpdate ESPhttpUpdate;