From 1fc7f4644a96b34a234fc3788a512a77536ec88f Mon Sep 17 00:00:00 2001 From: Rob Swindell <rob@synchro.net> Date: Wed, 4 Jan 2023 19:19:06 -0800 Subject: [PATCH] hosts need a "host/" prefix too to resolve conflict with "node" Yes, someone could have a local hostname of "node". <sigh> --- src/sbbs3/mqtt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sbbs3/mqtt.c b/src/sbbs3/mqtt.c index 94c08ee61c..72ae2c17f6 100644 --- a/src/sbbs3/mqtt.c +++ b/src/sbbs3/mqtt.c @@ -88,19 +88,19 @@ static char* format_topic(struct mqtt* mqtt, enum server_type type, enum topic_d safe_snprintf(str, size, "sbbs/%s", mqtt->cfg->sys_id); break; case TOPIC_HOST: - safe_snprintf(str, size, "sbbs/%s/%s/%s", mqtt->cfg->sys_id, mqtt->host, sbuf); + safe_snprintf(str, size, "sbbs/%s/host/%s/%s", mqtt->cfg->sys_id, mqtt->host, sbuf); break; case TOPIC_HOST_LEVEL: - safe_snprintf(str, size, "sbbs/%s/%s", mqtt->cfg->sys_id, mqtt->host); + safe_snprintf(str, size, "sbbs/%s/host/%s", mqtt->cfg->sys_id, mqtt->host); break; case TOPIC_SERVER: - safe_snprintf(str, size, "sbbs/%s/%s/server/%s/%s", mqtt->cfg->sys_id, mqtt->host, server_type_desc(type), sbuf); + safe_snprintf(str, size, "sbbs/%s/host/%s/server/%s/%s", mqtt->cfg->sys_id, mqtt->host, server_type_desc(type), sbuf); break; case TOPIC_SERVER_LEVEL: - safe_snprintf(str, size, "sbbs/%s/%s/server/%s", mqtt->cfg->sys_id, mqtt->host, server_type_desc(type)); + safe_snprintf(str, size, "sbbs/%s/host/%s/server/%s", mqtt->cfg->sys_id, mqtt->host, server_type_desc(type)); break; case TOPIC_EVENT: - safe_snprintf(str, size, "sbbs/%s/%s/event/%s", mqtt->cfg->sys_id, mqtt->host, sbuf); + safe_snprintf(str, size, "sbbs/%s/host/%s/event/%s", mqtt->cfg->sys_id, mqtt->host, sbuf); break; case TOPIC_OTHER: default: -- GitLab