Bug fix for failed read of OTA header due to not yet recived bytes.

arduino-libraries · Sep 8, 2023 · bf3429c · bf3429c
1 parent 370828b
commit bf3429c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/examples/LOLIN_32_Blink/LOLIN_32_Blink.ino.ota b/examples/LOLIN_32_Blink/LOLIN_32_Blink.ino.ota
diff --git a/src/Arduino_ESP32_OTA.cpp b/src/Arduino_ESP32_OTA.cpp
@@ -182,7 +182,25 @@ 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 ... */
-  _client->read(_ota_header.buf, sizeof(OtaHeader));
+  bool is_http_data_timeout = false;
+  for(int i = 0; i < sizeof(OtaHeader)-1 && !is_http_data_timeout; i++)
+  {
+    for(unsigned long const start = millis();;)
+    {
+      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;
+      }
+    }
+  }
+  //_client->read(_ota_header.buf, sizeof(OtaHeader));
 
   /* ... and check first length ... */
   if (_ota_header.header.len != (content_length_val - sizeof(_ota_header.header.len) - sizeof(_ota_header.header.crc32))) {