lib: net: fix CoAP downloads for PGPS downloads

Fixes issue introduced in #19908:
PGPS downloads were previously wrongly redirected
through the FOTA pipeline,
but should be handed over to downloader directly.

Signed-off-by: Maximilian Deubel <[email protected]>

Author: maxd-nordic

subsys/net/lib/nrf_cloud/src/nrf_cloud_download.c

@@ -110,11 +110,27 @@ static int coap_dl(struct nrf_cloud_download_data *const dl)
 		return ret;
 	}
 
-	return fota_download_with_host_cfg("coaps://" CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME,
-					   "proxy", dl->dl_host_conf.sec_tag_count ?
-					   dl->dl_host_conf.sec_tag_list[0] : -1,
-					   dl->dl_host_conf.pdn_id, dl->dl_host_conf.range_override,
-					   dl->fota.expected_type, &host_cfg);
+	const char *host = "coaps://" CONFIG_NRF_CLOUD_COAP_SERVER_HOSTNAME;
+	const char *file = "proxy";
+
+	if (dl->type == NRF_CLOUD_DL_TYPE_FOTA) {
+		return fota_download_with_host_cfg(host,
+						   file, dl->dl_host_conf.sec_tag_count ?
+						   dl->dl_host_conf.sec_tag_list[0] : -1,
+						   dl->dl_host_conf.pdn_id,
+						   dl->dl_host_conf.range_override,
+						   dl->fota.expected_type, &host_cfg);
+	} else {
+		/* If not downloading FOTA, use downloader directly */
+		dl->dl_host_conf.cid = true;
+		dl->dl_host_conf.auth_cb = nrf_cloud_download_handle_coap_auth;
+		dl->dl_host_conf.proxy_uri = proxy_uri;
+
+		return downloader_get_with_host_and_file(
+			dl->dl, &dl->dl_host_conf, host, file, 0
+		);
+	}
+
 }
 #endif /* NRF_CLOUD_COAP_DOWNLOADS */
 

subsys/net/lib/nrf_cloud/src/nrf_cloud_pgps_utils.c

@@ -562,6 +562,7 @@ static int downloader_callback(const struct downloader_evt *event)
 		 */
 		if ((socket_retries_left) && ((event->error == -ENOTCONN) ||
 					      (event->error == -ECONNREFUSED) ||
+					      (event->error == -EAGAIN) ||
 					      (event->error == -ECONNRESET))) {
 			LOG_WRN("Download socket error. %d retries left...",
 				socket_retries_left);