userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added free memory flag to MQTT transmit data structure

Browse Source
This commit is contained in:
Bogdan Pilyugin 2024-01-30 14:52:05 +02:00
parent 33da14fa0c
commit aaed490d84
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/MQTT.h
View File

@ -52,6 +52,7 @@ typedef struct
char topic[CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH]; char topic[CONFIG_WEBGUIAPP_MQTT_MAX_TOPIC_LENGTH];
char *raw_data_ptr; char *raw_data_ptr;
int data_length; int data_length;
bool keep_memory_onfinish;
}MQTT_DATA_SEND_STRUCT; }MQTT_DATA_SEND_STRUCT;
/** /**

11
src/MQTT.c
View File

@ -122,7 +122,7 @@ esp_err_t SysServiceMQTTSend(char *data, int len, int idx)
if (buf) if (buf)
{ {
memcpy(buf, data, len); memcpy(buf, data, len);
MQTT_DATA_SEND_STRUCT DSS; MQTT_DATA_SEND_STRUCT DSS = {0};
ComposeTopic(DSS.topic, idx, SERVICE_NAME, UPLINK_SUBTOPIC); ComposeTopic(DSS.topic, idx, SERVICE_NAME, UPLINK_SUBTOPIC);
DSS.raw_data_ptr = buf; DSS.raw_data_ptr = buf;
DSS.data_length = len; DSS.data_length = len;
@ -146,7 +146,7 @@ esp_err_t ExternalServiceMQTTSend(char *data, int len, int idx)
if (buf) if (buf)
{ {
memcpy(buf, data, len); memcpy(buf, data, len);
MQTT_DATA_SEND_STRUCT DSS; MQTT_DATA_SEND_STRUCT DSS = {0};
ComposeTopic(DSS.topic, idx, EXTERNAL_SERVICE_NAME, UPLINK_SUBTOPIC); ComposeTopic(DSS.topic, idx, EXTERNAL_SERVICE_NAME, UPLINK_SUBTOPIC);
DSS.raw_data_ptr = buf; DSS.raw_data_ptr = buf;
DSS.data_length = len; DSS.data_length = len;
@ -214,9 +214,9 @@ static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_bas
ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED client %d", idx); ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED client %d", idx);
#endif #endif
ComposeTopic(topic, idx, SERVICE_NAME, DOWNLINK_SUBTOPIC); ComposeTopic(topic, idx, SERVICE_NAME, DOWNLINK_SUBTOPIC);
msg_id = esp_mqtt_client_subscribe(client, (char*) topic, 0); msg_id = esp_mqtt_client_subscribe(client, (char*) topic, 0);
#if MQTT_DEBUG_MODE > 0 #if MQTT_DEBUG_MODE > 0
ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id); ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
ESP_LOGI(TAG, "Subscribe to %s", topic); ESP_LOGI(TAG, "Subscribe to %s", topic);
#endif #endif
#ifdef CONFIG_WEBGUIAPP_UART_TRANSPORT_ENABLE #ifdef CONFIG_WEBGUIAPP_UART_TRANSPORT_ENABLE
@ -394,7 +394,8 @@ void MQTTTaskTransmit(void *pvParameter)
} }
//else //else
// ESP_LOGW(TAG, "MQTT client not initialized or disconnected"); // ESP_LOGW(TAG, "MQTT client not initialized or disconnected");
free(DSS.raw_data_ptr); if (!DSS.keep_memory_onfinish)
free(DSS.raw_data_ptr);
} }
} }