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

Merge branch 'bugfix/early_retransmit' into 'master'

Browse Source 
Fix early retransmit

See merge request espressif/esp-mqtt!44
This commit is contained in:
David Čermák
2019-10-03 20:21:56 +08:00
parent 40302a3d43 52cdfa9087
commit 430676cadb
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/include/mqtt_outbox.h
View File

@ -45,6 +45,7 @@ esp_err_t outbox_delete_msgtype(outbox_handle_t outbox, int msg_type);
int outbox_delete_expired(outbox_handle_t outbox, int current_tick, int timeout); int outbox_delete_expired(outbox_handle_t outbox, int current_tick, int timeout);
esp_err_t outbox_set_pending(outbox_handle_t outbox, int msg_id, pending_state_t pending); esp_err_t outbox_set_pending(outbox_handle_t outbox, int msg_id, pending_state_t pending);
esp_err_t outbox_set_tick(outbox_handle_t outbox, int msg_id, int tick);
int outbox_get_size(outbox_handle_t outbox); int outbox_get_size(outbox_handle_t outbox);
esp_err_t outbox_cleanup(outbox_handle_t outbox, int max_size); esp_err_t outbox_cleanup(outbox_handle_t outbox, int max_size);
void outbox_destroy(outbox_handle_t outbox); void outbox_destroy(outbox_handle_t outbox);

10
lib/mqtt_outbox.c
View File

@ -131,6 +131,16 @@ esp_err_t outbox_set_pending(outbox_handle_t outbox, int msg_id, pending_state_t
return ESP_FAIL; return ESP_FAIL;
} }
esp_err_t outbox_set_tick(outbox_handle_t outbox, int msg_id, int tick)
{
outbox_item_handle_t item = outbox_get(outbox, msg_id);
if (item) {
item->tick = tick;
return ESP_OK;
}
return ESP_FAIL;
}
esp_err_t outbox_delete_msgtype(outbox_handle_t outbox, int msg_type) esp_err_t outbox_delete_msgtype(outbox_handle_t outbox, int msg_type)
{ {
outbox_item_handle_t item, tmp; outbox_item_handle_t item, tmp;

4
mqtt_client.c
View File

@ -1355,7 +1355,9 @@ int esp_mqtt_client_publish(esp_mqtt_client_handle_t client, const char *topic,
} }
} }
if (qos > 0) { if (qos > 0) {
//Tick is set after transmit to avoid retransmitting too early due slow network speed / big messages
outbox_set_tick(client->outbox, pending_msg_id, platform_tick_get_ms());
outbox_set_pending(client->outbox, pending_msg_id, TRANSMITTED); outbox_set_pending(client->outbox, pending_msg_id, TRANSMITTED);
} }
MQTT_API_UNLOCK_FROM_OTHER_TASK(client); MQTT_API_UNLOCK_FROM_OTHER_TASK(client);