MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 00:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the MQTT interface.

Browse Source
This commit is contained in:
Jonathan Naylor
2022-11-29 17:18:34 +00:00
parent 96364136d9
commit 53b73c6558
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MQTTPublisher.cpp
View File

@@ -23,9 +23,10 @@
#include <cstring>
CMQTTPublisher::CMQTTPublisher(const std::string& host, unsigned short port, unsigned int keepalive, unsigned int qos) :
CMQTTPublisher::CMQTTPublisher(const std::string& host, unsigned short port, const std::string& name, unsigned int keepalive, MQTT_QOS qos) :
m_host(host),
m_port(port),
m_name(name),
m_keepalive(keepalive),
m_qos(qos),
m_mosq(NULL),
@@ -33,8 +34,8 @@ m_connected(false)
{
assert(!host.empty());
assert(port > 0U);
assert(!name.empty());
assert(keepalive >= 5U);
assert(qos >= 0U && qos <= 2U);
::mosquitto_lib_init();
}
@@ -46,7 +47,7 @@ CMQTTPublisher::~CMQTTPublisher()
bool CMQTTPublisher::open()
{
m_mosq = ::mosquitto_new(NULL, true, this);
m_mosq = ::mosquitto_new(m_name.c_str(), true, this);
if (m_mosq == NULL){
::fprintf(stderr, "MQTT Error newing: Out of memory.\n");
return false;
@@ -81,8 +82,11 @@ bool CMQTTPublisher::publish(const char* topic, const char* text)
if (!m_connected)
return false;
int rc = ::mosquitto_publish(m_mosq, NULL, topic, ::strlen(text), text, m_qos, false);
char topicEx[100U];
::sprintf(topicEx, "%s/%s", m_name.c_str(), topic);
int rc = ::mosquitto_publish(m_mosq, NULL, topicEx, ::strlen(text), text, static_cast<int>(m_qos), false);
if (rc != MOSQ_ERR_SUCCESS) {
::fprintf(stderr, "MQTT Error publishing: %s\n", ::mosquitto_strerror(rc));
return false;