net: lib: downloader: avoid continous loop on error event

* The downloader expects an error to be returned from the error handler
  to abort the download. If not, the download will be retried
  indefinitely.
* Add missing break to stopped event switch case.
* Add dl_ prefix to internal downloader files.
* Set progress to false when download is done.

Signed-off-by: Eivind Jølsgard <[email protected]>

Author: eivindj-nordic

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -662,6 +662,13 @@ Libraries for networking
 
   * Fixed an issue where the results from the :c:func:`zsock_getaddrinfo` function were not freed when the CoAP protocol was used for connection establishment.
 
+* :ref:`lib_downloader` library:
+
+  * Fixed:
+
+    * A bug in the shell implementation causing endless download retries on errors.
+    * A bug in the shell to allow multiple downloads.
+
 Libraries for NFC
 -----------------
 

subsys/net/lib/downloader/CMakeLists.txt

@@ -8,7 +8,7 @@ zephyr_library_sources(
 	src/dl_parse.c
 	src/dl_socket.c
 	src/downloader.c
-	src/sanity.c
+	src/dl_sanity.c
 )
 
 zephyr_library_sources_ifdef(
@@ -23,7 +23,7 @@ zephyr_library_sources_ifdef(
 
 zephyr_library_sources_ifdef(
 	CONFIG_DOWNLOADER_SHELL
-	src/shell.c
+	src/dl_shell.c
 )
 
 zephyr_include_directories(./include)

subsys/net/lib/downloader/src/sanity.c renamed to subsys/net/lib/downloader/src/dl_sanity.c

@@ -55,16 +55,23 @@ static int dl_callback(const struct downloader_evt *event)
 		break;
 	case DOWNLOADER_EVT_DONE:
 		shell_print(shell_instance, "done (%d bytes)", downloaded);
+		in_progress = false;
 		downloaded = 0;
 		break;
 	case DOWNLOADER_EVT_ERROR:
 		shell_error(shell_instance, "error %d during download", event->error);
-		downloaded = 0;
-		in_progress = false;
-		break;
+		if (event->error == -ECONNRESET) {
+			/* Allow the downloader to retry. */
+			return 0;
+		}
+
+		/* Abort the download by returning an error. */
+		return event->error;
 	case DOWNLOADER_EVT_STOPPED:
 		shell_print(shell_instance, "download client closed");
 		in_progress = false;
+		downloaded = 0;
+		break;
 	case DOWNLOADER_EVT_DEINITIALIZED:
 		shell_print(shell_instance, "client deinitialized");
 		in_progress = false;

subsys/net/lib/downloader/src/shell.c renamed to subsys/net/lib/downloader/src/dl_shell.c

@@ -19,7 +19,7 @@ target_sources(app
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/downloader.c
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/dl_socket.c
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/dl_parse.c
-  ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/sanity.c
+  ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/dl_sanity.c
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/transports/coap.c
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/transports/http.c
 )