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

Add MQTT subscriptions for display and remote commands.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-19 17:16:14 +01:00
parent ff004211b9
commit 0615a4218d
4 changed files with 162 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MMDVMHost.cpp
View File

@@ -77,6 +77,8 @@ static void sigHandler2(int signum)
}
#endif
static CMMDVMHost* host = NULL;
const char* HEADER1 = "This software is for use on amateur radio networks only,";
const char* HEADER2 = "it is to be used for educational purposes only. Its use on";
const char* HEADER3 = "commercial networks is strictly prohibited.";
@@ -112,10 +114,11 @@ int main(int argc, char** argv)
do {
m_signal = 0;
CMMDVMHost* host = new CMMDVMHost(std::string(iniFile));
host = new CMMDVMHost(std::string(iniFile));
ret = host->run();
delete host;
host = NULL;
switch (m_signal) {
case 2:
@@ -289,7 +292,11 @@ int CMMDVMHost::run()
return 1;
}
m_mqtt = new CMQTTConnection(m_conf.getMQTTHost(), m_conf.getMQTTPort(), m_conf.getMQTTName(), m_conf.getMQTTKeepalive());
std::vector<std::pair<std::string, void (*)(const std::string&)>> subscriptions;
subscriptions.push_back(std::make_pair("display", CMMDVMHost::onDisplay));
subscriptions.push_back(std::make_pair("command", CMMDVMHost::onCommand));
m_mqtt = new CMQTTConnection(m_conf.getMQTTHost(), m_conf.getMQTTPort(), m_conf.getMQTTName(), subscriptions, m_conf.getMQTTKeepalive());
ret = m_mqtt->open();
if (!ret) {
::fprintf(stderr, "MMDVMHost: unable to start the MQTT Publisher\n");
@@ -2796,3 +2803,11 @@ void CMMDVMHost::writeJSONMessage(const std::string& message)
WriteJSON("MMDVM", json);
}
void CMMDVMHost::onCommand(const std::string& command)
{
}
void CMMDVMHost::onDisplay(const std::string& message)
{
}

3
MMDVMHost.h
View File

@@ -142,6 +142,9 @@ private:
void writeJSONMode(const std::string& mode);
void writeJSONMessage(const std::string& message);
static void onDisplay(const std::string& message);
static void onCommand(const std::string& command);
};
#endif

53
MQTTConnection.cpp
View File

@@ -23,10 +23,11 @@
#include <cstring>
CMQTTConnection::CMQTTConnection(const std::string& host, unsigned short port, const std::string& name, unsigned int keepalive, MQTT_QOS qos) :
CMQTTConnection::CMQTTConnection(const std::string& host, unsigned short port, const std::string& name, const std::vector<std::pair<std::string, void (*)(const std::string&)>>& subs, unsigned int keepalive, MQTT_QOS qos) :
m_host(host),
m_port(port),
m_name(name),
m_subs(subs),
m_keepalive(keepalive),
m_qos(qos),
m_mosq(NULL),
@@ -54,6 +55,8 @@ bool CMQTTConnection::open()
}
::mosquitto_connect_callback_set(m_mosq, onConnect);
::mosquitto_subscribe_callback_set(m_mosq, onSubscribe);
::mosquitto_message_callback_set(m_mosq, onMessage);
::mosquitto_disconnect_callback_set(m_mosq, onDisconnect);
int rc = ::mosquitto_connect(m_mosq, m_host.c_str(), m_port, m_keepalive);
@@ -111,9 +114,57 @@ void CMQTTConnection::onConnect(mosquitto* mosq, void* obj, int rc)
assert(obj != NULL);
::fprintf(stdout, "MQTT: on_connect: %s\n", ::mosquitto_connack_string(rc));
if (rc != 0) {
::mosquitto_disconnect(mosq);
return;
}
CMQTTConnection* p = static_cast<CMQTTConnection*>(obj);
p->m_connected = true;
for (std::vector<std::pair<std::string, void (*)(const std::string&)>>::const_iterator it = p->m_subs.cbegin(); it != p->m_subs.cend(); ++it) {
std::string topic = (*it).first;
char topicEx[100U];
::sprintf(topicEx, "%s/%s", p->m_name.c_str(), topic.c_str());
rc = ::mosquitto_subscribe(mosq, NULL, topicEx, MQTT_QOS_AT_LEAST_ONCE);
if (rc != MOSQ_ERR_SUCCESS) {
::fprintf(stderr, "MQTT: error subscribing to %s - %s\n", topicEx, ::mosquitto_strerror(rc));
::mosquitto_disconnect(mosq);
}
}
}
void CMQTTConnection::onSubscribe(mosquitto* mosq, void* obj, int mid, int qosCount, const int* grantedQOS)
{
assert(mosq != NULL);
assert(obj != NULL);
assert(grantedQOS != NULL);
for (int i = 0; i < qosCount; i++)
::fprintf(stdout, "MQTT: on_subscribe: %d:%d\n", i, grantedQOS[i]);
}
void CMQTTConnection::onMessage(mosquitto* mosq, void* obj, const mosquitto_message* message)
{
assert(mosq != NULL);
assert(obj != NULL);
assert(message != NULL);
CMQTTConnection* p = static_cast<CMQTTConnection*>(obj);
for (std::vector<std::pair<std::string, void (*)(const std::string&)>>::const_iterator it = p->m_subs.cbegin(); it != p->m_subs.cend(); ++it) {
std::string topic = (*it).first;
char topicEx[100U];
::sprintf(topicEx, "%s/%s", p->m_name.c_str(), topic.c_str());
if (::strcmp(topicEx, message->topic) == 0) {
(*it).second(std::string((char*)message->payload, message->payloadlen));
break;
}
}
}
void CMQTTConnection::onDisconnect(mosquitto* mosq, void* obj, int rc)

8
MQTTConnection.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 by Jonathan Naylor G4KLX
* Copyright (C) 2022,2023 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
#include <mosquitto.h>
#include <vector>
#include <string>
enum MQTT_QOS {
@@ -31,7 +32,7 @@ enum MQTT_QOS {
class CMQTTConnection {
public:
CMQTTConnection(const std::string& host, unsigned short port, const std::string& name, unsigned int keepalive, MQTT_QOS qos = MQTT_QOS_EXACTLY_ONCE);
CMQTTConnection(const std::string& host, unsigned short port, const std::string& name, const std::vector<std::pair<std::string, void (*)(const std::string&)>>& subs, unsigned int keepalive, MQTT_QOS qos = MQTT_QOS_EXACTLY_ONCE);
~CMQTTConnection();
bool open();
@@ -44,12 +45,15 @@ private:
std::string m_host;
unsigned short m_port;
std::string m_name;
std::vector<std::pair<std::string, void (*)(const std::string&)>> m_subs;
unsigned int m_keepalive;
MQTT_QOS m_qos;
mosquitto* m_mosq;
bool m_connected;
static void onConnect(mosquitto* mosq, void* obj, int rc);
static void onSubscribe(mosquitto* mosq, void* obj, int mid, int qosCount, const int* grantedQOS);
static void onMessage(mosquitto* mosq, void* obj, const mosquitto_message* message);
static void onDisconnect(mosquitto* mosq, void* obj, int rc);
};