ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-02-22 17:42:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-detect if MQTT broker supports shared-subscriptions.

Browse Source 
Closes #413.
This commit is contained in:
Orne Brocaar 2024-05-02 13:48:36 +01:00
parent 0d11ad609a
commit 5f6ccc35fb
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chirpstack/src/gateway/backend/mqtt.rs
View File

@ -185,10 +185,16 @@ impl<'a> MqttBackend<'a> {
} else { } else {
conf.event_topic.clone() conf.event_topic.clone()
}; };
let event_topic = format!("$share/{}/{}", conf.share_name, event_topic); let share_name = conf.share_name.clone();
async move { async move {
while connect_rx.recv().await.is_some() { while let Some(shared_sub_support) = connect_rx.recv().await {
let event_topic = if shared_sub_support {
format!("$share/{}/{}", share_name, event_topic)
} else {
event_topic.clone()
};
info!(region_id = %region_config_id, event_topic = %event_topic, "Subscribing to gateway event topic"); info!(region_id = %region_config_id, event_topic = %event_topic, "Subscribing to gateway event topic");
if let Err(e) = client.subscribe(&event_topic, qos).await { if let Err(e) = client.subscribe(&event_topic, qos).await {
error!(region_id = %region_config_id, event_topic = %event_topic, error = %e, "MQTT subscribe error"); error!(region_id = %region_config_id, event_topic = %event_topic, error = %e, "MQTT subscribe error");
@ -222,7 +228,18 @@ impl<'a> MqttBackend<'a> {
} }
Event::Incoming(Incoming::ConnAck(v)) => { Event::Incoming(Incoming::ConnAck(v)) => {
if v.code == ConnectReturnCode::Success { if v.code == ConnectReturnCode::Success {
if let Err(e) = connect_tx.try_send(()) { // Per specification:
// A value of 1 means Shared Subscriptions are supported. If not present, then Shared Subscriptions are supported.
let shared_sub_support = v
.properties
.map(|v| {
v.shared_subscription_available
.map(|v| v == 1)
.unwrap_or(true)
})
.unwrap_or(true);
if let Err(e) = connect_tx.try_send(shared_sub_support) {
error!(error = %e, "Send to subscribe channel error"); error!(error = %e, "Send to subscribe channel error");
} }
} else { } else {