Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-26 12:27:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix QoS 1 / QoS 2 publish incorrectly returning "no subscribers".

Browse Source 
Closes #3128.
This commit is contained in:
Roger A. Light
2024-10-09 00:54:30 +01:00
parent 849a1d3f8e
commit b979feb92a
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.txt
+4
View File
@@ -1,6 +1,10 @@
2.0.20 - 2024-xx-xx
===================
Broker:
- Fix QoS 1 / QoS 2 publish incorrectly returning "no subscribers".
Closes #3128.
Client library:
- Fix cmake build on OS X. Closes #3125.
src/subs.c
+16 -2
View File
@@ -659,6 +659,7 @@ int sub__remove(struct mosquitto *context, const char *sub, uint8_t *reason)
int sub__messages_queue(const char *source_id, const char *topic, uint8_t qos, int retain, struct mosquitto_msg_store **stored)
{
int rc = MOSQ_ERR_SUCCESS, rc2;
int rc_normal = MOSQ_ERR_NO_SUBSCRIBERS, rc_shared = MOSQ_ERR_NO_SUBSCRIBERS;
struct mosquitto__subhier *subhier;
char **split_topics = NULL;
char *local_topic = NULL;
@@ -675,12 +676,24 @@ int sub__messages_queue(const char *source_id, const char *topic, uint8_t qos, i
HASH_FIND(hh, db.normal_subs, split_topics[0], strlen(split_topics[0]), subhier);
if(subhier){
rc = sub__search(subhier, split_topics, source_id, topic, qos, retain, *stored);
rc_normal = sub__search(subhier, split_topics, source_id, topic, qos, retain, *stored);
if(rc_normal > 0){
rc = rc_normal;
goto end;
}
}
HASH_FIND(hh, db.shared_subs, split_topics[0], strlen(split_topics[0]), subhier);
if(subhier){
rc = sub__search(subhier, split_topics, source_id, topic, qos, retain, *stored);
rc_shared = sub__search(subhier, split_topics, source_id, topic, qos, retain, *stored);
if(rc_shared > 0){
rc = rc_shared;
goto end;
}
}
if(rc_normal == MOSQ_ERR_NO_SUBSCRIBERS && rc_shared == MOSQ_ERR_NO_SUBSCRIBERS){
rc = MOSQ_ERR_NO_SUBSCRIBERS;
}
if(retain){
@@ -688,6 +701,7 @@ int sub__messages_queue(const char *source_id, const char *topic, uint8_t qos, i
if(rc2) rc = rc2;
}
end:
mosquitto__free(split_topics);
mosquitto__free(local_topic);
/* Remove our reference and free if needed. */