add aws_mqtt_has_non_empty_username

Author: xiazhvera

include/aws/mqtt/private/mqtt_iot_metrics.h

@@ -56,4 +56,17 @@ int aws_mqtt_append_sdk_metrics_to_username(
 AWS_MQTT_API
 int aws_mqtt_validate_iot_metrics(const struct aws_mqtt_iot_metrics *metrics);
 
+/**
+ * Checks if username should be included in the CONNECT packet.
+ * Returns true if either username is provided or metrics are configured.
+ *
+ * @param username The username cursor (can be NULL)
+ * @param metrics_storage The metrics storage (can be NULL)
+ * @return true if username should be included, false otherwise
+ */
+AWS_MQTT_API
+bool aws_mqtt_has_non_empty_username(
+    const struct aws_byte_cursor *username,
+    const struct aws_mqtt_iot_metrics_storage *metrics_storage);
+
 #endif /* AWS_MQTT_IOT_METRICS_H */

source/client.c

@@ -635,7 +635,7 @@ static void s_mqtt_client_init(
             &connect, topic_cur, connection->will.qos, connection->will.retain, payload_cur);
     }
 
-    if (connection->username || connection->metrics_storage) {
+    if (aws_mqtt_has_non_empty_username(connection->username, connection->metrics_storage)) {
         struct aws_byte_cursor username_cur;
         AWS_ZERO_STRUCT(username_cur);
         if (connection->username) {
@@ -2083,7 +2083,7 @@ static enum aws_mqtt_client_request_state s_subscribe_send(uint16_t packet_id, b
         return AWS_MQTT_CLIENT_REQUEST_ERROR;
     }
 
-    AWS_VARIABLE_LENGTH_ARRAY(uint8_t, transaction_buf, num_topics * aws_mqtt_topic_tree_action_size);
+    AWS_VARIABLE_LENGTH_ARRAY(uint8_t, transaction_buf, num_topics *aws_mqtt_topic_tree_action_size);
     struct aws_array_list transaction;
     aws_array_list_init_static(&transaction, transaction_buf, num_topics, aws_mqtt_topic_tree_action_size);
 
@@ -2876,7 +2876,7 @@ static enum aws_mqtt_client_request_state s_unsubscribe_send(
 
     static const size_t num_topics = 1;
 
-    AWS_VARIABLE_LENGTH_ARRAY(uint8_t, transaction_buf, num_topics * aws_mqtt_topic_tree_action_size);
+    AWS_VARIABLE_LENGTH_ARRAY(uint8_t, transaction_buf, num_topics *aws_mqtt_topic_tree_action_size);
     struct aws_array_list transaction;
     aws_array_list_init_static(&transaction, transaction_buf, num_topics, aws_mqtt_topic_tree_action_size);
 

source/mqtt_iot_metrics.c

@@ -430,3 +430,9 @@ int aws_mqtt_validate_iot_metrics(const struct aws_mqtt_iot_metrics *metrics) {
 
     return AWS_OP_SUCCESS;
 }
+
+bool aws_mqtt_has_non_empty_username(
+    const struct aws_byte_cursor *username,
+    const struct aws_mqtt_iot_metrics_storage *metrics_storage) {
+    return (username != NULL && username->len > 0) || metrics_storage != NULL;
+}

source/v5/mqtt5_options_storage.c

@@ -646,7 +646,7 @@ static size_t s_aws_mqtt5_packet_connect_compute_storage_size(
 
     storage_size += view->client_id.len;
 
-    if (view->username != NULL || (options && options->metrics_storage != NULL)) {
+    if (aws_mqtt_has_non_empty_username(view->username, options ? options->metrics_storage : NULL)) {
 
         if (options) {
             size_t username_size = 0;
@@ -701,7 +701,8 @@ int aws_mqtt5_packet_connect_storage_init(
         return AWS_OP_ERR;
     }
 
-    if (view->username != NULL || (client_options_storage && client_options_storage->metrics_storage != NULL)) {
+    if (aws_mqtt_has_non_empty_username(
+            view->username, client_options_storage ? client_options_storage->metrics_storage : NULL)) {
         if (view->username) {
             storage->username = *view->username;
         }

tests/v5/mqtt5_to_mqtt3_adapter_tests.c

@@ -4168,7 +4168,8 @@ static int s_mqtt5to3_adapter_resubscribe_nothing_fn(struct aws_allocator *alloc
     s_wait_for_n_adapter_operation_events(&fixture, AWS_MQTT3_OET_SUBSCRIBE_COMPLETE, 1);
 
     struct aws_mqtt3_operation_event resubscribe_ack[] = {{
-        .type = AWS_MQTT3_OET_SUBSCRIBE_COMPLETE, .error_code = AWS_ERROR_MQTT_CONNECTION_RESUBSCRIBE_NO_TOPICS,
+        .type = AWS_MQTT3_OET_SUBSCRIBE_COMPLETE,
+        .error_code = AWS_ERROR_MQTT_CONNECTION_RESUBSCRIBE_NO_TOPICS,
         /* no granted subscriptions */
     }};
 
@@ -4512,9 +4513,11 @@ static int s_mqtt5to3_adapter_connection_set_metrics_invalid_utf8_library_fn(
     /* Invalid UTF-8 sequence */
     struct aws_byte_cursor invalid_utf8_library = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("TestSDK\xFF\xFE");
 
-    struct aws_mqtt_metadata_entry metadata_entries[] = {
-        {.key = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("key1\xFF\xFE"),
-         .value = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("value1\xFF\xFE")}};
+    struct aws_mqtt_metadata_entry metadata_entries[] = {{
+        .key = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("key1\xFF\xFE"),
+        .value = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("value1\xFF\xFE"),
+    }};
+
     struct aws_mqtt_iot_metrics metrics = {
         .library_name = invalid_utf8_library,
         .metadata_count = AWS_ARRAY_SIZE(metadata_entries),