Skip to content
Snippets Groups Projects
Commit 1fc7f464 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

hosts need a "host/" prefix too to resolve conflict with "node"

Yes, someone could have a local hostname of "node". <sigh>
parent f1f613ec
No related branches found
No related tags found
No related merge requests found
...@@ -88,19 +88,19 @@ static char* format_topic(struct mqtt* mqtt, enum server_type type, enum topic_d ...@@ -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); safe_snprintf(str, size, "sbbs/%s", mqtt->cfg->sys_id);
break; break;
case TOPIC_HOST: 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; break;
case TOPIC_HOST_LEVEL: 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; break;
case TOPIC_SERVER: 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; break;
case TOPIC_SERVER_LEVEL: 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; break;
case TOPIC_EVENT: 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; break;
case TOPIC_OTHER: case TOPIC_OTHER:
default: default:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment