net: lwm2m_client_utils: Detect supported download protocols

Detect supported download protocols based on enabled
Kconfig options.

Signed-off-by: Seppo Takalo <[email protected]>

Author: SeppoTakalo

subsys/net/lib/lwm2m_client_utils/lwm2m/lwm2m_firmware.c

@@ -1097,48 +1097,52 @@ static bool modem_has_credentials(int sec_tag, enum modem_key_mgmt_cred_type cre
 	return exist;
 }
 
-static void lwm2m_firware_pull_protocol_support_resource_init(int instance_id)
+static void insert_supported_protocol(int instance_id, int index, uint8_t *protocol)
 {
-	struct lwm2m_obj_path path;
 	int ret;
-	int supported_protocol_count;
+	struct lwm2m_obj_path path = LWM2M_OBJ(ENABLED_LWM2M_FIRMWARE_OBJECT, instance_id,
+					       LWM2M_FOTA_UPDATE_PROTO_SUPPORT_ID, index);
+	ret = lwm2m_create_res_inst(&path);
+	if (ret) {
+		return;
+	}
+
+	ret = lwm2m_set_res_buf(&path, protocol, sizeof(*protocol), sizeof(*protocol),
+				LWM2M_RES_DATA_FLAG_RO);
+	if (ret) {
+		lwm2m_delete_res_inst(&path);
+		return;
+	}
+}
+
+static void lwm2m_firmware_pull_protocol_support_resource_init(int instance_id)
+{
+	int index = 0;
 
 	if (!IS_ENABLED(CONFIG_LWM2M_CLIENT_UTILS_ADV_FIRMWARE_UPDATE_OBJ_SUPPORT)) {
 		lwm2m_firmware_object_pull_protocol_init(instance_id);
 	}
 
 	int tag = CONFIG_LWM2M_CLIENT_UTILS_DOWNLOADER_SEC_TAG;
+	bool has_ca = modem_has_credentials(tag, MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN);
+	bool has_psk = modem_has_credentials(tag, MODEM_KEY_MGMT_CRED_TYPE_PSK);
 
 	/* Check which protocols from pull_protocol_support[] may work.
 	 * Order in that list is CoAP, HTTP, CoAPS, HTTPS.
 	 * So unsecure protocols are first, those should always work.
 	 */
 
-	if (modem_has_credentials(tag, MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN)) {
-		/* CA chain means that HTTPS and CoAPS might work, support all */
-		supported_protocol_count = ARRAY_SIZE(pull_protocol_support);
-	} else if (modem_has_credentials(tag, MODEM_KEY_MGMT_CRED_TYPE_PSK)) {
-		/* PSK might work on CoAPS, not HTTPS. Drop it from the list */
-		supported_protocol_count = ARRAY_SIZE(pull_protocol_support) - 1;
-	} else {
-		/* Drop both secure protocols from list as we don't have credentials */
-		supported_protocol_count = ARRAY_SIZE(pull_protocol_support) - 2;
-	}
-
-	for (int i = 0; i < supported_protocol_count; i++) {
-		path = LWM2M_OBJ(ENABLED_LWM2M_FIRMWARE_OBJECT, instance_id,
-				 LWM2M_FOTA_UPDATE_PROTO_SUPPORT_ID, i);
 
-		ret = lwm2m_create_res_inst(&path);
-		if (ret) {
-			return;
+	if (IS_ENABLED(CONFIG_DOWNLOADER_TRANSPORT_COAP)) {
+		insert_supported_protocol(instance_id, index++, &pull_protocol_support[0]);
+		if (has_ca || has_psk) {
+			insert_supported_protocol(instance_id, index++, &pull_protocol_support[2]);
 		}
-
-		ret = lwm2m_set_res_buf(&path, &pull_protocol_support[i],
-					sizeof(uint8_t), sizeof(uint8_t), LWM2M_RES_DATA_FLAG_RO);
-		if (ret) {
-			lwm2m_delete_res_inst(&path);
-			return;
+	}
+	if (IS_ENABLED(CONFIG_DOWNLOADER_TRANSPORT_HTTP)) {
+		insert_supported_protocol(instance_id, index++, &pull_protocol_support[1]);
+		if (has_ca) {
+			insert_supported_protocol(instance_id, index++, &pull_protocol_support[3]);
 		}
 	}
 }
@@ -1307,7 +1311,7 @@ void update_thread(void *client, void *a, void *b)
 static void lwm2m_firmware_object_setup_init(int object_instance)
 {
 	lwm2m_firmware_load_from_settings(object_instance);
-	lwm2m_firware_pull_protocol_support_resource_init(object_instance);
+	lwm2m_firmware_pull_protocol_support_resource_init(object_instance);
 	lwm2m_firmware_register_write_callbacks(object_instance);
 }