mirror of
https://github.com/g4klx/ircDDBGateway.git
synced 2026-04-02 19:04:42 +02:00
fc571c1e13
MQTT Implementation (aligned with DStarGateway / MMDVMHost): - Rewrite MQTTConnection with mosquitto_loop_stop() fix to prevent background thread zombies on shutdown - Add MQTT authentication support (mqttAuth, mqttUsername, mqttPassword) - Add configurable client name (mqttName) used as topic prefix - Use PID-based client IDs (avoids time_t truncation on 32-bit ARM) - Use std::string interface throughout (no wxString in MQTT layer) - Align JSON link status fields with DStarGateway (repeater/reflector/ protocol/reason/action) for dashboard compatibility Shutdown Safety: - Add MQTTLogFinalise() calls to both daemon (IRCDDBGatewayAppD::run) and GUI (IRCDDBGatewayApp::OnExit) shutdown paths to ensure clean MQTT disconnection and thread cleanup before process exit JSON Status Events: - Update all ~30 WriteJSON call sites across DPlus, DExtra, DCS, and CCS protocol handlers to use new function signatures - Simplify IRCDDBGatewayThread::writeJSONStatus to delegate to WriteJSONStatus Config Parser Hardening: - Add empty-line crash guard to IRCDDBGatewayConfig, TimerControlConfig, and TimeServerConfig parsers (str.IsEmpty() check before GetChar) Documentation: - Add MQTT.md with topic structure, JSON examples, and troubleshooting - Add CONFIGURATION.md with full reference for all config files - Add BUILD.md with build parameters and dependency information - Add linux/ example configs for ircddbgateway, timeserver, timercontrol - Modernise README.md with feature list and DStarGateway recommendation
66 lines
2.2 KiB
C++
66 lines
2.2 KiB
C++
/*
|
|
* Copyright (C) 2022,2023,2025 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
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#if !defined(MQTTPUBLISHER_H)
|
|
#define MQTTPUBLISHER_H
|
|
|
|
#include <mosquitto.h>
|
|
|
|
#include <vector>
|
|
#include <string>
|
|
|
|
enum MQTT_QOS {
|
|
MQTT_QOS_AT_MODE_ONCE = 0U,
|
|
MQTT_QOS_AT_LEAST_ONCE = 1U,
|
|
MQTT_QOS_EXACTLY_ONCE = 2U
|
|
};
|
|
|
|
class CMQTTConnection {
|
|
public:
|
|
CMQTTConnection(const std::string& host, unsigned short port, const std::string& name, const bool authEnabled, const std::string& username, const std::string& password, const std::vector<std::pair<std::string, void (*)(const unsigned char*, unsigned int)>>& subs, unsigned int keepalive, MQTT_QOS qos = MQTT_QOS_EXACTLY_ONCE);
|
|
~CMQTTConnection();
|
|
|
|
bool open();
|
|
|
|
bool publish(const char* topic, const char* text);
|
|
bool publish(const char* topic, const std::string& text);
|
|
bool publish(const char* topic, const unsigned char* data, unsigned int len);
|
|
|
|
void close();
|
|
|
|
private:
|
|
std::string m_host;
|
|
unsigned short m_port;
|
|
std::string m_name;
|
|
bool m_authEnabled;
|
|
std::string m_username;
|
|
std::string m_password;
|
|
std::vector<std::pair<std::string, void (*)(const unsigned char*, unsigned int)>> 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);
|
|
};
|
|
|
|
#endif
|