[nrf fromtree] Fix BDX transfer resumption

When OTA is interrupted in the middle of a BDX transfer and the transfer is then re-initiated after the 5-minute idle timeout, it may fail with the following error: dfu_target_stream: stream_flash_buffered_write error -12 Signed-off-by: Damian Krolik <[email protected]> (cherry picked from commit 5e6279cc1debd0bb9da0a97dd82592f089a0c920)
nrfconnect · Sep 9, 2022 · 6cfff04 · 6cfff04
1 parent cafa0cd
commit 6cfff04
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
@@ -71,7 +71,7 @@ CHIP_ERROR OTAImageProcessorImpl::PrepareDownloadImpl()
         writer.image_id = image_id;
         writer.open     = [](int id, size_t size) { return dfu_target_init(DFU_TARGET_IMAGE_TYPE_MCUBOOT, id, size, nullptr); };
         writer.write    = [](const uint8_t * chunk, size_t chunk_size) { return dfu_target_write(chunk, chunk_size); };
-        writer.close    = [](bool success) { return dfu_target_done(success); };
+        writer.close    = [](bool success) { return success ? dfu_target_done(success) : dfu_target_reset(); };
 
         ReturnErrorOnFailure(System::MapErrorZephyr(dfu_multi_image_register_writer(&writer)));
     };

diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.h b/src/platform/nrfconnect/OTAImageProcessorImpl.h
@@ -56,7 +56,7 @@ class OTAImageProcessorImpl : public OTAImageProcessorInterface
     bool IsFirstImageRun() override;
     CHIP_ERROR ConfirmCurrentImage() override;
 
-private:
+protected:
     CHIP_ERROR PrepareDownloadImpl();
     CHIP_ERROR ProcessHeader(ByteSpan & aBlock);