net: downloader: add coap proxy-uri support

Add support for Proxy-URI options to downloader.
This is defined in RFC7252 and we need it for nRF Cloud.

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

Author: maxd-nordic

include/net/downloader.h

@@ -185,6 +185,11 @@ struct downloader_host_cfg {
 	 * Set to @c AF_UNSPEC (0) to fallback to @c AF_INET if @c AF_INET6 does not work.
 	 */
 	int family;
+	/**
+	 * CoAP Proxy-URI option.
+	 * This string is used in case you are requesting a proxied file from a CoAP server.
+	 */
+	const char *proxy_uri;
 };
 
 /**

subsys/net/lib/downloader/Kconfig

@@ -32,7 +32,7 @@ config DOWNLOADER_SHELL
 
 config DOWNLOADER_TRANSPORT_PARAMS_SIZE
 	int "Maximum transport parameter size"
-	default 128
+	default 256
 
 config DOWNLOADER_TRANSPORT_HTTP
 	bool "HTTP transport"

subsys/net/lib/downloader/src/transports/coap.c

@@ -57,6 +57,8 @@ struct transport_params_coap {
 	bool new_data_req;
 	/** Request retransmission */
 	bool retransmission_req;
+	/* Proxy-URI option value */
+	const char *proxy_uri;
 };
 
 BUILD_ASSERT(CONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE >= sizeof(struct transport_params_coap));
@@ -311,6 +313,15 @@ static int coap_request_send(struct downloader *dl)
 		return err;
 	}
 
+	if (coap->proxy_uri != NULL) {
+		err = coap_packet_append_option(&request, COAP_OPTION_PROXY_URI,
+			coap->proxy_uri, strlen(coap->proxy_uri));
+		if (err) {
+			LOG_ERR("Unable to add Proxy-URI option");
+			return err;
+		}
+	}
+
 	if (!has_pending(dl)) {
 		struct coap_transmission_parameters params = coap_get_transmission_parameters();
 
@@ -408,6 +419,9 @@ static int dl_coap_init(struct downloader *dl, struct downloader_host_cfg *dl_ho
 		coap->sock.type |= SOCK_NATIVE_TLS;
 	}
 
+	/* Copy proxy-uri to internal struct */
+	coap->proxy_uri = dl_host_cfg->proxy_uri;
+
 	return 0;
 }
 

tests/subsys/net/lib/downloader/CMakeLists.txt

@@ -36,7 +36,7 @@ target_compile_options(app
   PRIVATE
   -DCONFIG_DOWNLOADER_MAX_HOSTNAME_SIZE=256
   -DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=256
-  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=128
+  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
   -DCONFIG_DOWNLOADER_STACK_SIZE=2048
   -DCONFIG_NET_SOCKETS_POSIX_NAMES=y
   -DCONFIG_NET_IPV6=y

tests/subsys/net/lib/fota_download/CMakeLists.txt

@@ -34,7 +34,7 @@ target_compile_options(app
   -DCONFIG_DOWNLOADER_STACK_SIZE=500
   -DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=192
   -DCONFIG_DOWNLOADER_MAX_HOSTNAME_SIZE=128
-  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=128
+  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
   -DCONFIG_FW_MAGIC_LEN=32
   -DABI_INFO_MAGIC=0xdededede
   -DCONFIG_FW_FIRMWARE_INFO_OFFSET=0x200

tests/subsys/net/lib/lwm2m_client_utils/CMakeLists.txt

@@ -36,7 +36,7 @@ set(options
   -DCONFIG_DOWNLOADER_STACK_SIZE=4096
   -DCONFIG_DOWNLOADER_MAX_HOSTNAME_SIZE=128
   -DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=128
-  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=128
+  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
   -DCONFIG_LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT
   -DCONFIG_LWM2M_FIRMWARE_UPDATE_PULL_SUPPORT
   -DCONFIG_DFU_TARGET_MCUBOOT

tests/subsys/net/lib/lwm2m_fota_utils/CMakeLists.txt

@@ -35,7 +35,7 @@ set(options
   -DCONFIG_DOWNLOADER_STACK_SIZE=4096
   -DCONFIG_DOWNLOADER_MAX_HOSTNAME_SIZE=128
   -DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=128
-  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=128
+  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
   -DCONFIG_LWM2M_FIRMWARE_UPDATE_OBJ_SUPPORT
   -DCONFIG_LWM2M_FIRMWARE_UPDATE_PULL_SUPPORT
   -DCONFIG_DFU_TARGET_MCUBOOT=y

tests/subsys/net/lib/mcumgr_smp_client/CMakeLists.txt

@@ -44,7 +44,7 @@ target_compile_options(app
   -DCONFIG_FOTA_DOWNLOAD_RESOURCE_LOCATOR_LENGTH=512
   -DCONFIG_DOWNLOADER_MAX_HOSTNAME_SIZE=128
   -DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=128
-  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=128
+  -DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
   -DCONFIG_DOWNLOADER_STACK_SIZE=1024
   -DCONFIG_DFU_TARGET_SMP=1
   )