Split sub and retain trees.
Roger Light
6 years ago
committed by
Roger A. Light
parent
d003fed383
commit
d92360dd8e
@ -0,0 +1,299 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2010-2019 Roger Light <roger@atchoo.org>
|
||||||
|
|
||||||
|
All rights reserved. This program and the accompanying materials
|
||||||
|
are made available under the terms of the Eclipse Public License v1.0
|
||||||
|
and Eclipse Distribution License v1.0 which accompany this distribution.
|
||||||
|
|
||||||
|
The Eclipse Public License is available at
|
||||||
|
http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
and the Eclipse Distribution License is available at
|
||||||
|
http://www.eclipse.org/org/documents/edl-v10.php.
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Roger Light - initial implementation and documentation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "mosquitto_broker_internal.h"
|
||||||
|
#include "memory_mosq.h"
|
||||||
|
#include "mqtt_protocol.h"
|
||||||
|
#include "util_mosq.h"
|
||||||
|
|
||||||
|
#include "utlist.h"
|
||||||
|
|
||||||
|
static struct mosquitto__retainhier *retain__add_hier_entry(struct mosquitto__retainhier *parent, struct mosquitto__retainhier **sibling, const char *topic, size_t len)
|
||||||
|
{
|
||||||
|
struct mosquitto__retainhier *child;
|
||||||
|
|
||||||
|
assert(sibling);
|
||||||
|
|
||||||
|
child = mosquitto__calloc(1, sizeof(struct mosquitto__retainhier));
|
||||||
|
if(!child){
|
||||||
|
log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
child->parent = parent;
|
||||||
|
child->topic_len = len;
|
||||||
|
child->topic = mosquitto__malloc(len+1);
|
||||||
|
if(!child->topic){
|
||||||
|
child->topic_len = 0;
|
||||||
|
mosquitto__free(child);
|
||||||
|
log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
|
||||||
|
return NULL;
|
||||||
|
}else{
|
||||||
|
strncpy(child->topic, topic, child->topic_len+1);
|
||||||
|
}
|
||||||
|
|
||||||
|
HASH_ADD_KEYPTR(hh, *sibling, child->topic, child->topic_len, child);
|
||||||
|
|
||||||
|
return child;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int retain__init(struct mosquitto_db *db)
|
||||||
|
{
|
||||||
|
struct mosquitto__retainhier *retainhier;
|
||||||
|
|
||||||
|
retainhier = retain__add_hier_entry(NULL, &db->retains, "", strlen(""));
|
||||||
|
if(!retainhier) return MOSQ_ERR_NOMEM;
|
||||||
|
|
||||||
|
retainhier = retain__add_hier_entry(NULL, &db->retains, "$SYS", strlen("$SYS"));
|
||||||
|
if(!retainhier) return MOSQ_ERR_NOMEM;
|
||||||
|
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int retain__store(struct mosquitto_db *db, const char *topic, struct mosquitto_msg_store *stored, struct sub__token *tokens)
|
||||||
|
{
|
||||||
|
struct mosquitto__retainhier *retainhier;
|
||||||
|
struct mosquitto__retainhier *branch;
|
||||||
|
struct sub__token *local_tokens = NULL, *token_current;
|
||||||
|
|
||||||
|
assert(stored);
|
||||||
|
if(tokens == NULL){
|
||||||
|
if(sub__topic_tokenise(topic, &local_tokens)) return 1;
|
||||||
|
}else{
|
||||||
|
local_tokens = tokens;
|
||||||
|
}
|
||||||
|
token_current = local_tokens;
|
||||||
|
|
||||||
|
HASH_FIND(hh, db->retains, local_tokens->topic, local_tokens->topic_len, retainhier);
|
||||||
|
|
||||||
|
while(token_current){
|
||||||
|
HASH_FIND(hh, retainhier->children, token_current->topic, token_current->topic_len, branch);
|
||||||
|
if(branch == NULL){
|
||||||
|
branch = retain__add_hier_entry(retainhier, &retainhier->children, token_current->topic, token_current->topic_len);
|
||||||
|
if(branch == NULL){
|
||||||
|
if(tokens == NULL){
|
||||||
|
sub__topic_tokens_free(local_tokens);
|
||||||
|
}
|
||||||
|
return MOSQ_ERR_NOMEM;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
retainhier = branch;
|
||||||
|
token_current = token_current->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef WITH_PERSISTENCE
|
||||||
|
if(strncmp(topic, "$SYS", 4)){
|
||||||
|
/* Retained messages count as a persistence change, but only if
|
||||||
|
* they aren't for $SYS. */
|
||||||
|
db->persistence_changes++;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if(retainhier->retained){
|
||||||
|
db__msg_store_ref_dec(db, &retainhier->retained);
|
||||||
|
#ifdef WITH_SYS_TREE
|
||||||
|
db->retained_count--;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
if(stored->payloadlen){
|
||||||
|
retainhier->retained = stored;
|
||||||
|
db__msg_store_ref_inc(retainhier->retained);
|
||||||
|
#ifdef WITH_SYS_TREE
|
||||||
|
db->retained_count++;
|
||||||
|
#endif
|
||||||
|
}else{
|
||||||
|
retainhier->retained = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(tokens == NULL){
|
||||||
|
sub__topic_tokens_free(local_tokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int retain__process(struct mosquitto_db *db, struct mosquitto__retainhier *branch, struct mosquitto *context, int sub_qos, uint32_t subscription_identifier, time_t now)
|
||||||
|
{
|
||||||
|
int rc = 0;
|
||||||
|
int qos;
|
||||||
|
uint16_t mid;
|
||||||
|
mosquitto_property *properties = NULL;
|
||||||
|
struct mosquitto_msg_store *retained;
|
||||||
|
|
||||||
|
if(branch->retained->message_expiry_time > 0 && now > branch->retained->message_expiry_time){
|
||||||
|
db__msg_store_ref_dec(db, &branch->retained);
|
||||||
|
branch->retained = NULL;
|
||||||
|
#ifdef WITH_SYS_TREE
|
||||||
|
db->retained_count--;
|
||||||
|
#endif
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
retained = branch->retained;
|
||||||
|
|
||||||
|
rc = mosquitto_acl_check(db, context, retained->topic, retained->payloadlen, UHPA_ACCESS(retained->payload, retained->payloadlen),
|
||||||
|
retained->qos, retained->retain, MOSQ_ACL_READ);
|
||||||
|
if(rc == MOSQ_ERR_ACL_DENIED){
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
}else if(rc != MOSQ_ERR_SUCCESS){
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Check for original source access */
|
||||||
|
if(db->config->check_retain_source && retained->origin != mosq_mo_broker && retained->source_id){
|
||||||
|
struct mosquitto retain_ctxt;
|
||||||
|
memset(&retain_ctxt, 0, sizeof(struct mosquitto));
|
||||||
|
|
||||||
|
retain_ctxt.id = retained->source_id;
|
||||||
|
retain_ctxt.username = retained->source_username;
|
||||||
|
retain_ctxt.listener = retained->source_listener;
|
||||||
|
|
||||||
|
rc = acl__find_acls(db, &retain_ctxt);
|
||||||
|
if(rc) return rc;
|
||||||
|
|
||||||
|
rc = mosquitto_acl_check(db, &retain_ctxt, retained->topic, retained->payloadlen, UHPA_ACCESS(retained->payload, retained->payloadlen),
|
||||||
|
retained->qos, retained->retain, MOSQ_ACL_WRITE);
|
||||||
|
if(rc == MOSQ_ERR_ACL_DENIED){
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
}else if(rc != MOSQ_ERR_SUCCESS){
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (db->config->upgrade_outgoing_qos){
|
||||||
|
qos = sub_qos;
|
||||||
|
} else {
|
||||||
|
qos = retained->qos;
|
||||||
|
if(qos > sub_qos) qos = sub_qos;
|
||||||
|
}
|
||||||
|
if(qos > 0){
|
||||||
|
mid = mosquitto__mid_generate(context);
|
||||||
|
}else{
|
||||||
|
mid = 0;
|
||||||
|
}
|
||||||
|
if(subscription_identifier > 0){
|
||||||
|
mosquitto_property_add_varint(&properties, MQTT_PROP_SUBSCRIPTION_IDENTIFIER, subscription_identifier);
|
||||||
|
}
|
||||||
|
return db__message_insert(db, context, mid, mosq_md_out, qos, true, retained, properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int retain__search(struct mosquitto_db *db, struct mosquitto__retainhier *retainhier, struct sub__token *tokens, struct mosquitto *context, const char *sub, int sub_qos, uint32_t subscription_identifier, time_t now, int level)
|
||||||
|
{
|
||||||
|
struct mosquitto__retainhier *branch, *branch_tmp;
|
||||||
|
int flag = 0;
|
||||||
|
|
||||||
|
if(!strcmp(tokens->topic, "#") && !tokens->next){
|
||||||
|
HASH_ITER(hh, retainhier->children, branch, branch_tmp){
|
||||||
|
/* Set flag to indicate that we should check for retained messages
|
||||||
|
* on "foo" when we are subscribing to e.g. "foo/#" and then exit
|
||||||
|
* this function and return to an earlier retain__search().
|
||||||
|
*/
|
||||||
|
flag = -1;
|
||||||
|
if(branch->retained){
|
||||||
|
retain__process(db, branch, context, sub_qos, subscription_identifier, now);
|
||||||
|
}
|
||||||
|
if(branch->children){
|
||||||
|
retain__search(db, branch, tokens, context, sub, sub_qos, subscription_identifier, now, level+1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if(!strcmp(tokens->topic, "+")){
|
||||||
|
HASH_ITER(hh, retainhier->children, branch, branch_tmp){
|
||||||
|
if(tokens->next){
|
||||||
|
if(retain__search(db, branch, tokens->next, context, sub, sub_qos, subscription_identifier, now, level+1) == -1
|
||||||
|
|| (tokens->next && !strcmp(tokens->next->topic, "#") && level>0)){
|
||||||
|
|
||||||
|
if(branch->retained){
|
||||||
|
retain__process(db, branch, context, sub_qos, subscription_identifier, now);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if(branch->retained){
|
||||||
|
retain__process(db, branch, context, sub_qos, subscription_identifier, now);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
HASH_FIND(hh, retainhier->children, tokens->topic, tokens->topic_len, branch);
|
||||||
|
if(branch){
|
||||||
|
if(tokens->next){
|
||||||
|
if(retain__search(db, branch, tokens->next, context, sub, sub_qos, subscription_identifier, now, level+1) == -1
|
||||||
|
|| (tokens->next && !strcmp(tokens->next->topic, "#") && level>0)){
|
||||||
|
|
||||||
|
if(branch->retained){
|
||||||
|
retain__process(db, branch, context, sub_qos, subscription_identifier, now);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if(branch->retained){
|
||||||
|
retain__process(db, branch, context, sub_qos, subscription_identifier, now);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return flag;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int retain__queue(struct mosquitto_db *db, struct mosquitto *context, const char *sub, int sub_qos, uint32_t subscription_identifier)
|
||||||
|
{
|
||||||
|
struct mosquitto__retainhier *retainhier;
|
||||||
|
struct sub__token *tokens = NULL;
|
||||||
|
time_t now;
|
||||||
|
|
||||||
|
assert(db);
|
||||||
|
assert(context);
|
||||||
|
assert(sub);
|
||||||
|
|
||||||
|
if(sub__topic_tokenise(sub, &tokens)) return 1;
|
||||||
|
|
||||||
|
HASH_FIND(hh, db->retains, tokens->topic, tokens->topic_len, retainhier);
|
||||||
|
|
||||||
|
if(retainhier){
|
||||||
|
now = time(NULL);
|
||||||
|
retain__search(db, retainhier, tokens, context, sub, sub_qos, subscription_identifier, now, 0);
|
||||||
|
}
|
||||||
|
sub__topic_tokens_free(tokens);
|
||||||
|
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void retain__clean(struct mosquitto_db *db, struct mosquitto__retainhier **retainhier)
|
||||||
|
{
|
||||||
|
struct mosquitto__retainhier *peer, *retainhier_tmp;
|
||||||
|
|
||||||
|
HASH_ITER(hh, *retainhier, peer, retainhier_tmp){
|
||||||
|
if(peer->retained){
|
||||||
|
db__msg_store_ref_dec(db, &peer->retained);
|
||||||
|
}
|
||||||
|
retain__clean(db, &peer->children);
|
||||||
|
mosquitto__free(peer->topic);
|
||||||
|
|
||||||
|
HASH_DELETE(hh, *retainhier, peer);
|
||||||
|
mosquitto__free(peer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,137 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2010-2019 Roger Light <roger@atchoo.org>
|
||||||
|
|
||||||
|
All rights reserved. This program and the accompanying materials
|
||||||
|
are made available under the terms of the Eclipse Public License v1.0
|
||||||
|
and Eclipse Distribution License v1.0 which accompany this distribution.
|
||||||
|
|
||||||
|
The Eclipse Public License is available at
|
||||||
|
http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
and the Eclipse Distribution License is available at
|
||||||
|
http://www.eclipse.org/org/documents/edl-v10.php.
|
||||||
|
|
||||||
|
Contributors:
|
||||||
|
Roger Light - initial implementation and documentation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "mosquitto_broker_internal.h"
|
||||||
|
#include "memory_mosq.h"
|
||||||
|
#include "mqtt_protocol.h"
|
||||||
|
#include "util_mosq.h"
|
||||||
|
|
||||||
|
#include "utlist.h"
|
||||||
|
|
||||||
|
|
||||||
|
static struct sub__token *sub__topic_append(struct sub__token **tail, struct sub__token **topics, char *topic)
|
||||||
|
{
|
||||||
|
struct sub__token *new_topic;
|
||||||
|
|
||||||
|
if(!topic){
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
new_topic = mosquitto__malloc(sizeof(struct sub__token));
|
||||||
|
if(!new_topic){
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
new_topic->next = NULL;
|
||||||
|
new_topic->topic_len = strlen(topic);
|
||||||
|
new_topic->topic = mosquitto__malloc(new_topic->topic_len+1);
|
||||||
|
if(!new_topic->topic){
|
||||||
|
mosquitto__free(new_topic);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
strncpy(new_topic->topic, topic, new_topic->topic_len+1);
|
||||||
|
|
||||||
|
if(*tail){
|
||||||
|
(*tail)->next = new_topic;
|
||||||
|
*tail = (*tail)->next;
|
||||||
|
}else{
|
||||||
|
*topics = new_topic;
|
||||||
|
*tail = new_topic;
|
||||||
|
}
|
||||||
|
return new_topic;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int sub__topic_tokenise(const char *subtopic, struct sub__token **topics)
|
||||||
|
{
|
||||||
|
struct sub__token *new_topic, *tail = NULL;
|
||||||
|
int len;
|
||||||
|
int start, stop, tlen;
|
||||||
|
int i;
|
||||||
|
char *topic;
|
||||||
|
|
||||||
|
assert(subtopic);
|
||||||
|
assert(topics);
|
||||||
|
|
||||||
|
if(subtopic[0] != '$'){
|
||||||
|
new_topic = sub__topic_append(&tail, topics, "");
|
||||||
|
if(!new_topic) goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
len = strlen(subtopic);
|
||||||
|
|
||||||
|
if(subtopic[0] == '/'){
|
||||||
|
new_topic = sub__topic_append(&tail, topics, "");
|
||||||
|
if(!new_topic) goto cleanup;
|
||||||
|
|
||||||
|
start = 1;
|
||||||
|
}else{
|
||||||
|
start = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
stop = 0;
|
||||||
|
for(i=start; i<len+1; i++){
|
||||||
|
if(subtopic[i] == '/' || subtopic[i] == '\0'){
|
||||||
|
stop = i;
|
||||||
|
|
||||||
|
if(start != stop){
|
||||||
|
tlen = stop-start;
|
||||||
|
|
||||||
|
topic = mosquitto__malloc(tlen+1);
|
||||||
|
if(!topic) goto cleanup;
|
||||||
|
memcpy(topic, &subtopic[start], tlen);
|
||||||
|
topic[tlen] = '\0';
|
||||||
|
new_topic = sub__topic_append(&tail, topics, topic);
|
||||||
|
mosquitto__free(topic);
|
||||||
|
}else{
|
||||||
|
new_topic = sub__topic_append(&tail, topics, "");
|
||||||
|
}
|
||||||
|
if(!new_topic) goto cleanup;
|
||||||
|
start = i+1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return MOSQ_ERR_SUCCESS;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
tail = *topics;
|
||||||
|
*topics = NULL;
|
||||||
|
while(tail){
|
||||||
|
mosquitto__free(tail->topic);
|
||||||
|
new_topic = tail->next;
|
||||||
|
mosquitto__free(tail);
|
||||||
|
tail = new_topic;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void sub__topic_tokens_free(struct sub__token *tokens)
|
||||||
|
{
|
||||||
|
struct sub__token *tail;
|
||||||
|
|
||||||
|
while(tokens){
|
||||||
|
tail = tokens->next;
|
||||||
|
mosquitto__free(tokens->topic);
|
||||||
|
mosquitto__free(tokens);
|
||||||
|
tokens = tail;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Loading…
Reference in New Issue