Simplify OTA header download timeout check

Author: pennam

src/Arduino_ESP32_OTA.cpp

@@ -182,31 +182,30 @@ int Arduino_ESP32_OTA::download(const char * ota_url)
   DEBUG_VERBOSE("%s: Length of OTA binary according to HTTP header = %d bytes", __FUNCTION__, content_length_val);
 
   /* Read the OTA header ... */
-  bool is_http_data_timeout = false;
-  for(int i = 0; i < sizeof(OtaHeader) && !is_http_data_timeout; i++)
+  bool is_ota_header_timeout  = false;
+  unsigned long const start = millis();
+  for (int i = 0; i < sizeof(OtaHeader);)
   {
-    for(unsigned long const start = millis();;)
+    is_ota_header_timeout = (millis() - start) > ARDUINO_ESP32_OTA_BINARY_HEADER_RECEIVE_TIMEOUT_ms;
+    if (is_ota_header_timeout) break;
+
+    if (_client->available())
     {
-      is_http_data_timeout = (millis() - start) > ARDUINO_ESP32_OTA_BINARY_BYTE_RECEIVE_TIMEOUT_ms;
-      if (is_http_data_timeout) 
-      {
-        DEBUG_ERROR("%s: timeout waiting data", __FUNCTION__);
-        break;
-      }
-      if (_client->available()) 
-      {
-        _ota_header.buf[i] = _client->read();
-        break;
-      }
+      _ota_header.buf[i++] = _client->read();
     }
   }
-  //_client->read(_ota_header.buf, sizeof(OtaHeader));
 
-  /* ... and check first length ... */
+  /* ... check for header download timeout ... */
+  if (is_ota_header_timeout) {
+    return static_cast<int>(Error::OtaHeaderTimeout);
+  }
+
+  /* ... then check if OTA header length field matches HTTP content length... */
   if (_ota_header.header.len != (content_length_val - sizeof(_ota_header.header.len) - sizeof(_ota_header.header.crc32))) {
     return static_cast<int>(Error::OtaHeaderLength);
   }
 
+  /* ... and OTA magic number */
   if (_ota_header.header.magic_number != ARDUINO_ESP32_OTA_MAGIC)
   {
     return static_cast<int>(Error::OtaHeaterMagicNumber);

src/Arduino_ESP32_OTA.h

@@ -39,6 +39,7 @@
  ******************************************************************************/
 
 static uint32_t const ARDUINO_ESP32_OTA_HTTP_HEADER_RECEIVE_TIMEOUT_ms = 10000;
+static uint32_t const ARDUINO_ESP32_OTA_BINARY_HEADER_RECEIVE_TIMEOUT_ms = 10000;
 static uint32_t const ARDUINO_ESP32_OTA_BINARY_BYTE_RECEIVE_TIMEOUT_ms = 2000;
 
 /******************************************************************************
@@ -71,6 +72,7 @@ class Arduino_ESP32_OTA
     OtaHeaderCrc         = -10,
     OtaHeaterMagicNumber = -11,
     OtaDownload          = -12,
+    OtaHeaderTimeout     = -13
   };
 
            Arduino_ESP32_OTA();