Fixes #270

grodansparadis · Apr 7, 2024 · 1f63a85 · 1f63a85
1 parent d0b017c
commit 1f63a85
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/debug/linux/vscpd.json b/debug/linux/vscpd.json
@@ -33,7 +33,7 @@
         },
         "user" : "vscp",
         "password": "secret",
-        "clientid" : "fluorine vscpd",  
+        "clientid" : "fluorine vscpd {{rnd}}",  
         "publish-format" : "json",
         "subscribe-format" : "auto",
         "qos" : 1,

diff --git a/src/vscp/common/vscp_client_mqtt.cpp b/src/vscp/common/vscp_client_mqtt.cpp
@@ -1625,6 +1625,23 @@ vscpClientMqtt::init(void)
   int rv = 0;
 
   if (m_clientid.length()) {
+
+    /*
+      if clientid if contains {{rd}} replace
+      with 16 random hex characters
+    */
+    {
+      std::string clientid_template = m_clientid;
+      mustache subtemplate{ clientid_template };
+      data data;
+
+      std::string strsalt;
+      vscp_getSaltHex(strsalt, 8);
+
+      data.set("rnd", strsalt);
+      m_clientid = subtemplate.render(data);
+    }
+
     m_mosq = mosquitto_new(m_clientid.c_str(), m_bCleanSession, this);
   }
   else {
@@ -2344,9 +2361,9 @@ vscpClientMqtt::send(vscpEvent &ev)
                   ppublish->getRetain());
 
     spdlog::trace("MQTT send; len=%d QOS=%d retain=%s\n",
-           (int) lenPayload,
-           ppublish->getQos(),
-           (ppublish->getRetain() ? "true" : "false"));
+                  (int) lenPayload,
+                  ppublish->getQos(),
+                  (ppublish->getRetain() ? "true" : "false"));
 
     if (MOSQ_ERR_SUCCESS != (rv = mosquitto_publish(m_mosq,
                                                     NULL, // msg id