Seperate MQTT5 from MQTT 3.1.1

lib/include/mqtt5_client_priv.h

@@ -0,0 +1,54 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _MQTT5_CLIENT_PRIV_H_
+#define _MQTT5_CLIENT_PRIV_H_
+
+#include "mqtt5_client.h"
+#include "mqtt_client_priv.h"
+#include "mqtt5_msg.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct mqtt5_topic_alias {
+    char *topic;
+    uint16_t topic_len;
+    uint16_t topic_alias;
+    STAILQ_ENTRY(mqtt5_topic_alias) next;
+} mqtt5_topic_alias_t;
+STAILQ_HEAD(mqtt5_topic_alias_list_t, mqtt5_topic_alias);
+typedef struct mqtt5_topic_alias_list_t *mqtt5_topic_alias_handle_t;
+typedef struct mqtt5_topic_alias *mqtt5_topic_alias_item_t;
+
+typedef struct {
+    esp_mqtt5_connection_property_storage_t connect_property_info;
+    esp_mqtt5_connection_will_property_storage_t will_property_info;
+    esp_mqtt5_connection_server_resp_property_t server_resp_property_info;
+    esp_mqtt5_disconnect_property_config_t disconnect_property_info;
+    const esp_mqtt5_publish_property_config_t *publish_property_info;
+    const esp_mqtt5_subscribe_property_config_t *subscribe_property_info;
+    const esp_mqtt5_unsubscribe_property_config_t *unsubscribe_property_info;
+    mqtt5_topic_alias_handle_t peer_topic_alias;
+} mqtt5_config_storage_t;
+
+void esp_mqtt5_flow_control(esp_mqtt5_client_handle_t client);
+void esp_mqtt5_parse_pubcomp(esp_mqtt5_client_handle_t client);
+void esp_mqtt5_parse_puback(esp_mqtt5_client_handle_t client);
+void esp_mqtt5_parse_unsuback(esp_mqtt5_client_handle_t client);
+void esp_mqtt5_parse_suback(esp_mqtt5_client_handle_t client);
+esp_err_t esp_mqtt5_parse_connack(esp_mqtt5_client_handle_t client, int *connect_rsp_code);
+void esp_mqtt5_client_destory(esp_mqtt5_client_handle_t client);
+esp_err_t esp_mqtt5_client_publish_check(esp_mqtt5_client_handle_t client, int qos, int retain);
+esp_err_t esp_mqtt5_client_subscribe_check(esp_mqtt5_client_handle_t client, int qos);
+esp_err_t esp_mqtt5_create_default_config(esp_mqtt5_client_handle_t client);
+esp_err_t esp_mqtt5_get_publish_data(esp_mqtt5_client_handle_t client, uint8_t *msg_buf, size_t msg_read_len, char **msg_topic, size_t *msg_topic_len, char **msg_data, size_t *msg_data_len);
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
+#endif

lib/include/mqtt5_msg.h

@@ -2,7 +2,7 @@
 #define MQTT5_MSG_H
 #include <stdint.h>
 #include <stdbool.h>
-
+#include "sys/queue.h"
 #include "mqtt_config.h"
 #include "mqtt_msg.h"
 #include "mqtt_client.h"

lib/include/mqtt_client_priv.h

@@ -0,0 +1,136 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _MQTT_CLIENT_PRIV_H_
+#define _MQTT_CLIENT_PRIV_H_
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "esp_err.h"
+#include "platform.h"
+
+#include "esp_event.h"
+#include "mqtt_client.h"
+#include "mqtt_msg.h"
+#ifdef MQTT_PROTOCOL_5
+#include "mqtt5_client_priv.h"
+#endif
+#include "esp_transport.h"
+#include "esp_transport_tcp.h"
+#include "esp_transport_ssl.h"
+#include "esp_transport_ws.h"
+#include "esp_log.h"
+#include "mqtt_outbox.h"
+#include "freertos/event_groups.h"
+#include <errno.h>
+#include <string.h>
+
+#include "mqtt_supported_features.h"
+
+/* using uri parser */
+#include "http_parser.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef MQTT_DISABLE_API_LOCKS
+# define MQTT_API_LOCK(c)
+# define MQTT_API_UNLOCK(c)
+#else
+# define MQTT_API_LOCK(c)          xSemaphoreTakeRecursive(c->api_lock, portMAX_DELAY)
+# define MQTT_API_UNLOCK(c)        xSemaphoreGiveRecursive(c->api_lock)
+#endif /* MQTT_USE_API_LOCKS */
+
+typedef struct mqtt_state {
+    uint8_t *in_buffer;
+    uint8_t *out_buffer;
+    int in_buffer_length;
+    int out_buffer_length;
+    size_t message_length;
+    size_t in_buffer_read_len;
+    mqtt_message_t *outbound_message;
+    mqtt_connection_t mqtt_connection;
+    uint16_t pending_msg_id;
+    int pending_msg_type;
+    int pending_publish_qos;
+    int pending_msg_count;
+} mqtt_state_t;
+
+typedef struct {
+    mqtt_event_callback_t event_handle;
+    esp_event_loop_handle_t event_loop_handle;
+    int task_stack;
+    int task_prio;
+    char *uri;
+    char *host;
+    char *path;
+    char *scheme;
+    int port;
+    bool auto_reconnect;
+    void *user_context;
+    int network_timeout_ms;
+    int refresh_connection_after_ms;
+    int reconnect_timeout_ms;
+    char **alpn_protos;
+    int num_alpn_protos;
+    char *clientkey_password;
+    int clientkey_password_len;
+    bool use_global_ca_store;
+    esp_err_t ((*crt_bundle_attach)(void *conf));
+    const char *cacert_buf;
+    size_t cacert_bytes;
+    const char *clientcert_buf;
+    size_t clientcert_bytes;
+    const char *clientkey_buf;
+    size_t clientkey_bytes;
+    const struct psk_key_hint *psk_hint_key;
+    bool skip_cert_common_name_check;
+    bool use_secure_element;
+    void *ds_data;
+    int message_retransmit_timeout;
+} mqtt_config_storage_t;
+
+typedef enum {
+    MQTT_STATE_INIT = 0,
+    MQTT_STATE_DISCONNECTED,
+    MQTT_STATE_CONNECTED,
+    MQTT_STATE_WAIT_RECONNECT,
+} mqtt_client_state_t;
+
+struct esp_mqtt_client {
+    esp_transport_list_handle_t transport_list;
+    esp_transport_handle_t transport;
+    mqtt_config_storage_t *config;
+    mqtt_state_t  mqtt_state;
+    mqtt_connect_info_t connect_info;
+    mqtt_client_state_t state;
+    uint64_t refresh_connection_tick;
+    int64_t keepalive_tick;
+    uint64_t reconnect_tick;
+#ifdef MQTT_PROTOCOL_5
+    mqtt5_config_storage_t *mqtt5_config;
+    uint16_t send_publish_packet_count; // This is for MQTT v5.0 flow control
+#endif
+    int wait_timeout_ms;
+    int auto_reconnect;
+    esp_mqtt_event_t event;
+    bool run;
+    bool wait_for_ping_resp;
+    outbox_handle_t outbox;
+    EventGroupHandle_t status_bits;
+    SemaphoreHandle_t  api_lock;
+    TaskHandle_t       task_handle;
+};
+
+bool esp_mqtt_set_if_config(char const *const new_config, char **old_config);
+void esp_mqtt_destroy_config(esp_mqtt_client_handle_t client);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
+#endif