Add new function to header. Minor tweaks.

Signed-off-by: Vidar Madsen <[email protected]>
eclipse · Feb 19, 2021 · ebfcc84 · ebfcc84
1 parent 6bea9f7
commit ebfcc84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/database.c b/src/database.c
@@ -918,7 +918,6 @@ int db__message_remove_incoming(struct mosquitto* context, uint16_t mid)
  }
 }
 
-
 int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 {
  struct mosquitto_client_msg *tail, *tmp;

diff --git a/src/handle_publish.c b/src/handle_publish.c
@@ -286,9 +286,9 @@ int handle__publish(struct mosquitto *context)
  db__message_store_find(context, msg->source_mid, &stored);
  }
 
- if (stored && (stored->qos != msg->qos || stored->payloadlen != msg->payloadlen || strcmp(stored->topic, msg->topic) || memcmp(stored->payload, msg->payload, msg->payloadlen))){
- log__printf(NULL, MOSQ_LOG_WARNING, "Reused message ID from %s detected. Clearing from storage.", context->id);
- db__message_remove_incoming(context, stored->mid);
+ if (stored && msg->source_mid != 0 && (stored->qos != msg->qos || stored->payloadlen != msg->payloadlen || strcmp(stored->topic, msg->topic) || memcmp(stored->payload, msg->payload, msg->payloadlen) )){
+ log__printf(NULL, MOSQ_LOG_WARNING, "Reused message ID %u from %s detected. Clearing from storage.", msg->source_mid, context->id);
+ db__message_remove_incoming(context, msg->source_mid);
  stored = NULL;
  }
 

diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
@@ -639,6 +639,7 @@ int persist__restore(void);
 int db__message_count(int *count);
 int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state expect_state, int qos);
 int db__message_insert(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_direction dir, uint8_t qos, bool retain, struct mosquitto_msg_store *stored, mosquitto_property *properties, bool update);
+int db__message_remove_incoming(struct mosquitto* context, uint16_t mid);
 int db__message_release_incoming(struct mosquitto *context, uint16_t mid);
 int db__message_update_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state state, int qos);
 void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_data *msg_data);