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

Config: Add a new option to use incremental message id

Browse Source 
This option is off by default, so the client still uses
random message id unless CONFIG_MQTT_MSG_ID_INCREMENTAL is set

Closes https://github.com/espressif/esp-mqtt/issues/176
This commit is contained in:
David Cermak
2020-12-06 11:46:36 +01:00
parent f65d5d05db
commit 8bb4a26f46
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/mqtt_config.h
View File

@ -15,6 +15,8 @@
#define MQTT_RECON_DEFAULT_MS (10*1000) #define MQTT_RECON_DEFAULT_MS (10*1000)
#define MQTT_POLL_READ_TIMEOUT_MS (1000) #define MQTT_POLL_READ_TIMEOUT_MS (1000)
#define MQTT_MSG_ID_INCREMENTAL CONFIG_MQTT_MSG_ID_INCREMENTAL
#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
lib/include/mqtt_msg.h
View File

@ -70,8 +70,9 @@ typedef struct mqtt_message {
typedef struct mqtt_connection { typedef struct mqtt_connection {
mqtt_message_t message; mqtt_message_t message;
#if MQTT_MSG_ID_INCREMENTAL
uint16_t message_id; uint16_t last_message_id; /*!< last used id if incremental message id configured */
#endif
uint8_t *buffer; uint8_t *buffer;
size_t buffer_length; size_t buffer_length;
@ -83,7 +84,7 @@ typedef struct mqtt_connect_info {
char *password; char *password;
char *will_topic; char *will_topic;
char *will_message; char *will_message;
int keepalive; // keepalive=0 -> keepalive is disabled int keepalive; /*!< keepalive=0 -> keepalive is disabled */
int will_length; int will_length;
int will_qos; int will_qos;
int will_retain; int will_retain;

4
lib/mqtt_msg.c
View File

@ -64,7 +64,11 @@ static uint16_t append_message_id(mqtt_connection_t *connection, uint16_t messag
// If message_id is zero then we should assign one, otherwise // If message_id is zero then we should assign one, otherwise
// we'll use the one supplied by the caller // we'll use the one supplied by the caller
while (message_id == 0) { while (message_id == 0) {
#if MQTT_MSG_ID_INCREMENTAL
message_id = ++connection->last_message_id;
#else
message_id = platform_random(65535); message_id = platform_random(65535);
#endif
} }
if (connection->message.length + 2 > connection->buffer_length) { if (connection->message.length + 2 > connection->buffer_length) {