Skip to content

Commit

Permalink
* NEW [bridge] support rap + rh in MQTT V5 bridging
Browse files Browse the repository at this point in the history 
Signed-off-by: jaylin <jaylin@emqx.io>
  • Loading branch information
@JaylinYu
JaylinYu committed Sep 11, 2023
1 parent 9fcf620 commit 752055f
Showing 1 changed file with 39 additions and 16 deletions.
55 changes: 39 additions & 16 deletions nanomq/bridge.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -686,14 +686,21 @@ quic_ack_cb(void *arg)
for (size_t i = 0; i < param->config->sub_count; i++) {
nng_mqtt_topic_qos *topic_qos =
nng_mqtt_topic_qos_array_create(1);
nng_mqtt_topic_qos_array_set(topic_qos, 0,
nng_mqtt_topic_qos_array_set(topic_qos, i,
param->config->sub_list[i]->topic,
param->config->sub_list[i]->qos, 1,
param->config->sub_list[i]
->retain_as_published,
param->config->sub_list[i]
->retain_handling);
log_info("Bridge client subscribed topic %s "
"(qos %d rap %d rh %d).",
param->config->sub_list[i]->topic,
param->config->sub_list[i]->qos, 1, 0, 0);
log_info("Quic bridge client subscribe to "
"topic (QoS "
"%d)%s.",
param->config->sub_list[i]->qos,
param->config->sub_list[i]->topic);
param->config->sub_list[i]
->retain_as_published,
param->config->sub_list[i]
->retain_handling);

property *properties = NULL;
if (param->config->proto_ver ==
Expand All @@ -712,11 +719,19 @@ quic_ack_cb(void *arg)
for (size_t i = 0; i < param->config->sub_count; i++) {
nng_mqtt_topic_qos_array_set(topic_qos, i,
param->config->sub_list[i]->topic,
param->config->sub_list[i]->qos, 1, 0, 0);
log_info("Quic bridge client subscribed topic "
"(q%d)%s.",
param->config->sub_list[i]->qos, 1,
param->config->sub_list[i]
->retain_as_published,
param->config->sub_list[i]
->retain_handling);
log_info("Bridge client subscribed topic %s "
"(qos %d rap %d rh %d).",
param->config->sub_list[i]->topic,
param->config->sub_list[i]->qos,
param->config->sub_list[i]->topic);
param->config->sub_list[i]
->retain_as_published,
param->config->sub_list[i]
->retain_handling);
}
property *properties = NULL;
if (param->config->proto_ver ==
Expand Down Expand Up @@ -845,10 +860,14 @@ bridge_tcp_connect_cb(nng_pipe p, nng_pipe_ev ev, void *arg)
for (size_t i = 0; i < param->config->sub_count; i++) {
nng_mqtt_topic_qos_array_set(topic_qos, i,
param->config->sub_list[i]->topic,
param->config->sub_list[i]->qos, 1, 0, 0);
log_info("Bridge client subscribed topic %s (qos %d).",
param->config->sub_list[i]->qos, 1,
param->config->sub_list[i]->retain_as_published,
param->config->sub_list[i]->retain_handling);
log_info("Bridge client subscribed topic %s (qos %d rap %d rh %d).",
param->config->sub_list[i]->topic,
param->config->sub_list[i]->qos);
param->config->sub_list[i]->qos,
param->config->sub_list[i]->retain_as_published,
param->config->sub_list[i]->retain_handling);
}
nng_mqtt_client *client = param->client;

Expand Down Expand Up @@ -948,10 +967,14 @@ bridge_tcp_reload(nng_socket *sock, conf *config, conf_bridge_node *node, bridge
for (size_t i = 0; i < bridge_arg->config->sub_count; i++) {
nng_mqtt_topic_qos_array_set(topic_qos, i,
bridge_arg->config->sub_list[i]->topic,
bridge_arg->config->sub_list[i]->qos, 1, 0, 0);
log_info("Bridge client subscribed topic %s (qos %d).",
bridge_arg->config->sub_list[i]->qos, 1,
bridge_arg->config->sub_list[i]->retain_as_published,
bridge_arg->config->sub_list[i]->retain_handling);
log_info("Bridge client subscribed topic %s (qos %d rap %d rh %d).",
bridge_arg->config->sub_list[i]->topic,
bridge_arg->config->sub_list[i]->qos);
bridge_arg->config->sub_list[i]->qos,
bridge_arg->config->sub_list[i]->retain_as_published,
bridge_arg->config->sub_list[i]->retain_handling);
}
nng_mqtt_client *client = bridge_arg->client;

Expand Down

0 comments on commit 752055f

Please sign in to comment.