net: lib: nrf_cloud: add coap client downloads

WIP

Signed-off-by: Justin Morton <justin.morton@nordicsemi.no>

subsys/net/lib/nrf_cloud/Kconfig.nrf_cloud_coap

@@ -9,6 +9,7 @@ menuconfig NRF_CLOUD_COAP
 	select ZCBOR
 	select COAP
 	select COAP_EXTENDED_OPTIONS_LEN
+	select DOWNLOAD_CLIENT_COAP_CLIENT
 	select COAP_CLIENT
 	select EXPERIMENTAL
 	select LTE_PROPRIETARY_PSM_REQ if (SOC_NRF9161_LACA || SOC_NRF9151_LACA || SOC_NRF9131_LACA)

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

@@ -9,12 +9,115 @@
 #if defined(CONFIG_FOTA_DOWNLOAD)
 #include <net/fota_download.h>
 #endif
+#if defined(CONFIG_NRF_CLOUD_COAP)
+#include "../coap/include/nrf_cloud_coap_transport.h"
+#endif
+
 #include "nrf_cloud_download.h"
 LOG_MODULE_REGISTER(nrf_cloud_download, CONFIG_NRF_CLOUD_LOG_LEVEL);
 
 static K_MUTEX_DEFINE(active_dl_mutex);
 static struct nrf_cloud_download_data active_dl = { .type = NRF_CLOUD_DL_TYPE_NONE };
 
+#if defined(CONFIG_NRF_CLOUD_COAP)
+#define ACPT_IDX 0
+#define PRXY_IDX 1
+#define OPT_CNT  2
+/* CoAP option array */
+static struct coap_client_option cc_opts[OPT_CNT] = {0};
+/* CoAP client to be used for file downloads */
+static struct nrf_cloud_coap_client coap_client;
+#endif
+
+static int coap_dl_init(void)
+{
+#if defined(CONFIG_NRF_CLOUD_COAP)
+	return nrf_cloud_coap_transport_init(&coap_client);
+#else
+	return 0;
+#endif
+}
+
+static int coap_connect_and_auth(struct nrf_cloud_download_data *const dl)
+{
+#if defined(CONFIG_NRF_CLOUD_COAP)
+	int ret = nrf_cloud_coap_transport_connect(&coap_client);
+
+	if (ret) {
+		LOG_ERR("CoAP connect failed, error; %d", ret);
+		return -EIO;
+	}
+
+	ret = nrf_cloud_coap_transport_authenticate(&coap_client);
+	if (ret) {
+		LOG_ERR("CoAP authentication failed, error; %d", ret);
+		return -EACCES;
+	}
+#endif
+	return 0;
+}
+
+static int coap_dl_disconnect(void)
+{
+#if defined(CONFIG_NRF_CLOUD_COAP)
+	return nrf_cloud_coap_transport_disconnect(&coap_client);
+#else
+	return 0;
+#endif
+}
+
+static int dlc_start(struct nrf_cloud_download_data *const dl)
+{
+	int ret;
+	const char *path = dl->path;
+
+	if (IS_ENABLED(CONFIG_NRF_CLOUD_COAP)) {
+
+		ret = coap_dl_init();
+		if (ret) {
+			/* ERROR TODO */
+			return ret;
+		}
+
+		ret = coap_connect_and_auth(dl);
+		if (ret) {
+			/* ERROR TODO */
+			return ret;
+		}
+
+		/* Set the download_client's coap_client */
+		dl->dlc->coap.dlc_cc.cc = &coap_client.cc;
+
+		/* Get the options for the proxy download */
+		ret = nrf_cloud_coap_transport_proxy_dl_opts_get(&cc_opts[ACPT_IDX],
+								 &cc_opts[PRXY_IDX],
+								 dl->host, dl->path);
+		if (ret) {
+			LOG_ERR("Failed to set CoAP options, error: %d", ret);
+			return ret;
+		}
+
+		/* Set the options in the download_client */
+		dl->dlc->coap.dlc_cc.opts = cc_opts;
+		dl->dlc->coap.dlc_cc.opt_cnt = OPT_CNT;
+
+		/* Use nRF Cloud's proxy download resource */
+		path = NRF_CLOUD_COAP_PROXY_RSC;
+	}
+
+	/* Start the download */
+	return download_client_get(dl->dlc, dl->host, &dl->dl_cfg, path, 0);
+}
+
+static int dlc_disconnect(struct nrf_cloud_download_data *const dl)
+{
+	if (IS_ENABLED(CONFIG_NRF_CLOUD_COAP)) {
+		return coap_dl_disconnect();
+	}
+
+	return download_client_disconnect(dl->dlc);
+}
+
 void nrf_cloud_download_end(void)
 {
 	k_mutex_lock(&active_dl_mutex, K_FOREVER);
@@ -52,7 +155,7 @@ int nrf_cloud_download_start(struct nrf_cloud_download_data *const dl)
 	 */
 	if (active_dl.type == NRF_CLOUD_DL_TYPE_DL_CLIENT) {
 		LOG_INF("Stopping active download, incoming FOTA update download has priority");
-		ret = download_client_disconnect(active_dl.dlc);
+		ret = dlc_disconnect(&active_dl);
 
 		if (ret) {
 			LOG_ERR("download_client_disconnect() failed, error %d", ret);
@@ -66,10 +169,9 @@ int nrf_cloud_download_start(struct nrf_cloud_download_data *const dl)
 			dl->dl_cfg.pdn_id, dl->dl_cfg.frag_size_override, dl->fota.expected_type);
 #endif
 	} else if (dl->type == NRF_CLOUD_DL_TYPE_DL_CLIENT) {
-		ret = download_client_get(dl->dlc, dl->host, &dl->dl_cfg,
-					  dl->path, 0);
+		ret = dlc_start(dl);
 		if (ret) {
-			(void)download_client_disconnect(dl->dlc);
+			(void)dlc_disconnect(dl);
 		}
 	} else {
 		LOG_WRN("Unhandled download type: %d", dl->type);

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

@@ -473,6 +473,10 @@ int npgps_download_init(npgps_buffer_handler_t buf_handler, npgps_eot_handler_t
 	buffer_handler = buf_handler;
 	eot_handler = end_handler;
 
+	if (IS_ENABLED(CONFIG_NRF_CLOUD_COAP)) {
+		return download_client_init_coap(&dlc, download_client_callback);
+	}
+
 	return download_client_init(&dlc, download_client_callback);
 }