Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-25 19:34:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the return of plugin__handle_message not being fully handled.

Browse Source
This commit is contained in:
Roger A. Light
2021-05-21 14:54:28 +01:00
parent 90e3b287de
commit 0e1388a615
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/handle_publish.c
+16 -14
View File
@@ -244,8 +244,11 @@ int handle__publish(struct mosquitto *context)
/* Check for topic access */
rc = mosquitto_acl_check(context, msg->topic, msg->payloadlen, msg->payload, msg->qos, msg->retain, MOSQ_ACL_WRITE);
if(rc == MOSQ_ERR_ACL_DENIED){
log__printf(NULL, MOSQ_LOG_DEBUG, "Denied PUBLISH from %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))", context->id, dup, msg->qos, msg->retain, msg->source_mid, msg->topic, (long)msg->payloadlen);
reason_code = MQTT_RC_NOT_AUTHORIZED;
log__printf(NULL, MOSQ_LOG_DEBUG,
"Denied PUBLISH from %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))",
context->id, dup, msg->qos, msg->retain, msg->source_mid, msg->topic,
(long)msg->payloadlen);
reason_code = MQTT_RC_NOT_AUTHORIZED;
goto process_bad_message;
}else if(rc != MOSQ_ERR_SUCCESS){
db__msg_store_free(msg);
@@ -260,23 +263,22 @@ int handle__publish(struct mosquitto *context)
db__msg_store_free(msg);
return rc;
#else
if(msg->qos == 1){
if (send__puback(context, msg->source_mid, MQTT_RC_SUCCESS, NULL)) {
return MOSQ_ERR_UNKNOWN;
}
}else if(msg->qos == 2){
if(send__pubrec(context, msg->source_mid, MQTT_RC_SUCCESS, NULL)){
return MOSQ_ERR_UNKNOWN;
}
}
db__msg_store_free(msg);
return MOSQ_ERR_SUCCESS;
reason_code = MQTT_RC_IMPLEMENTATION_SPECIFIC;
goto process_bad_message;
#endif
}
{
rc = plugin__handle_message(context, msg);
if(rc){
if(rc == MOSQ_ERR_ACL_DENIED){
log__printf(NULL, MOSQ_LOG_DEBUG,
"Denied PUBLISH from %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))",
context->id, dup, msg->qos, msg->retain, msg->source_mid, msg->topic,
(long)msg->payloadlen);
reason_code = MQTT_RC_NOT_AUTHORIZED;
goto process_bad_message;
}else if(rc != MOSQ_ERR_SUCCESS){
db__msg_store_free(msg);
return rc;
}