espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 02:38:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Config: Add a new option to disable publishing when disconnected

Browse Source 
Related https://github.com/espressif/esp-mqtt/pull/177
This commit is contained in:
David Cermak
2020-12-06 14:08:45 +01:00
parent dc7fd5c0b1
commit f44dcb1c26
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mqtt_client.h
View File

@ -302,8 +302,10 @@ int esp_mqtt_client_unsubscribe(esp_mqtt_client_handle_t client, const char *top
* - This API might block for several seconds, either due to network timeout (10s) * - This API might block for several seconds, either due to network timeout (10s)
* or if publishing payloads longer than internal buffer (due to message * or if publishing payloads longer than internal buffer (due to message
* fragmentation) * fragmentation)
* - Client doesn't have to be connected to send publish message * - Client doesn't have to be connected for this API to work, enqueueing the messages
* (although it would drop all qos=0 messages, qos>1 messages would be enqueued) * with qos>1 (returning -1 for all the qos=0 messages if disconnected).
* If MQTT_SKIP_PUBLISH_IF_DISCONNECTED is enabled, this API will not attempt to publish
* when the client is not connected and will always return -1.
* - It is thread safe, please refer to `esp_mqtt_client_subscribe` for details * - It is thread safe, please refer to `esp_mqtt_client_subscribe` for details
* *
* @param client mqtt client handle * @param client mqtt client handle

2
lib/include/mqtt_config.h
View File

@ -17,6 +17,8 @@
#define MQTT_MSG_ID_INCREMENTAL CONFIG_MQTT_MSG_ID_INCREMENTAL #define MQTT_MSG_ID_INCREMENTAL CONFIG_MQTT_MSG_ID_INCREMENTAL
#define MQTT_SKIP_PUBLISH_IF_DISCONNECTED CONFIG_MQTT_SKIP_PUBLISH_IF_DISCONNECTED
#if CONFIG_MQTT_BUFFER_SIZE #if CONFIG_MQTT_BUFFER_SIZE
#define MQTT_BUFFER_SIZE_BYTE CONFIG_MQTT_BUFFER_SIZE #define MQTT_BUFFER_SIZE_BYTE CONFIG_MQTT_BUFFER_SIZE
#else #else

7
mqtt_client.c
View File

@ -1653,6 +1653,13 @@ static inline int mqtt_client_enqueue_priv(esp_mqtt_client_handle_t client, cons
int esp_mqtt_client_publish(esp_mqtt_client_handle_t client, const char *topic, const char *data, int len, int qos, int retain) int esp_mqtt_client_publish(esp_mqtt_client_handle_t client, const char *topic, const char *data, int len, int qos, int retain)
{ {
MQTT_API_LOCK(client); MQTT_API_LOCK(client);
#if MQTT_SKIP_PUBLISH_IF_DISCONNECTED
if (client->state != MQTT_STATE_CONNECTED) {
ESP_LOGE(TAG, "Publish failed: client is not connected");
MQTT_API_UNLOCK(client);
return -1;
}
#endif
int pending_msg_id = mqtt_client_enqueue_priv(client, topic, data, len, qos, retain); int pending_msg_id = mqtt_client_enqueue_priv(client, topic, data, len, qos, retain);
if (pending_msg_id < 0) { if (pending_msg_id < 0) {
MQTT_API_UNLOCK(client); MQTT_API_UNLOCK(client);