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
114 lines
2.7 KiB
C++
114 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2015,2016,2020,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.
|
|
*/
|
|
|
|
#include "MQTTLog.h"
|
|
#include "Utils.h"
|
|
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
#include <cstdarg>
|
|
#include <ctime>
|
|
#include <cassert>
|
|
#include <cstring>
|
|
|
|
CMQTTConnection* m_mqtt = NULL;
|
|
|
|
void MQTTLogInitialise()
|
|
{
|
|
}
|
|
|
|
void MQTTLogFinalise()
|
|
{
|
|
if (m_mqtt != NULL) {
|
|
m_mqtt->close();
|
|
delete m_mqtt;
|
|
m_mqtt = NULL;
|
|
}
|
|
}
|
|
|
|
void WriteJSON(const std::string& topLevel, nlohmann::json& json)
|
|
{
|
|
if (m_mqtt != NULL) {
|
|
nlohmann::json top;
|
|
|
|
top[topLevel] = json;
|
|
|
|
m_mqtt->publish("json", top.dump());
|
|
}
|
|
}
|
|
|
|
void WriteJSONStatus(const std::string& status)
|
|
{
|
|
nlohmann::json json;
|
|
|
|
json["timestamp"] = CUtils::createTimestamp();
|
|
json["message"] = status;
|
|
|
|
WriteJSON("status", json);
|
|
}
|
|
|
|
void WriteJSONLinking(const std::string& repeater, const std::string& reason, const std::string& protocol, const std::string& reflector)
|
|
{
|
|
nlohmann::json json;
|
|
|
|
json["timestamp"] = CUtils::createTimestamp();
|
|
json["repeater"] = repeater;
|
|
json["action"] = "linking";
|
|
json["reason"] = reason;
|
|
json["reflector"] = reflector;
|
|
json["protocol"] = protocol;
|
|
|
|
WriteJSON("link", json);
|
|
}
|
|
|
|
void WriteJSONUnlinked(const std::string& repeater, const std::string& reason)
|
|
{
|
|
nlohmann::json json;
|
|
|
|
json["timestamp"] = CUtils::createTimestamp();
|
|
json["repeater"] = repeater;
|
|
json["action"] = "unlinked";
|
|
json["reason"] = reason;
|
|
|
|
WriteJSON("link", json);
|
|
}
|
|
|
|
void WriteJSONFailed(const std::string& repeater)
|
|
{
|
|
nlohmann::json json;
|
|
|
|
json["timestamp"] = CUtils::createTimestamp();
|
|
json["repeater"] = repeater;
|
|
json["action"] = "failed";
|
|
|
|
WriteJSON("link", json);
|
|
}
|
|
|
|
void WriteJSONRelinking(const std::string& repeater, const std::string& protocol, const std::string& reflector)
|
|
{
|
|
nlohmann::json json;
|
|
|
|
json["timestamp"] = CUtils::createTimestamp();
|
|
json["repeater"] = repeater;
|
|
json["action"] = "relinking";
|
|
json["reflector"] = reflector;
|
|
json["protocol"] = protocol;
|
|
|
|
WriteJSON("link", json);
|
|
}
|