nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check mqtt version before adding handler

Browse Source
This commit is contained in:
john30
2017-08-27 14:21:02 +02:00
parent 2828ba6c77
commit f41e316c84
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mqtthandler.cpp
+6 -6
View File
@@ -200,6 +200,12 @@ const struct argp_child* mqtthandler_getargs() {
bool mqtthandler_register(UserInfo* userInfo, BusHandler* busHandler, MessageMap* messages, bool mqtthandler_register(UserInfo* userInfo, BusHandler* busHandler, MessageMap* messages,
list<DataHandler*>* handlers) { list<DataHandler*>* handlers) {
if (g_port > 0) { if (g_port > 0) {
int major = -1;
mosquitto_lib_version(&major, NULL, NULL);
if (major != LIBMOSQUITTO_MAJOR) {
logOtherError("mqtt", "invalid mosquitto version %d instead of %d", major, LIBMOSQUITTO_MAJOR);
return false;
}
handlers->push_back(new MqttHandler(userInfo, busHandler, messages)); handlers->push_back(new MqttHandler(userInfo, busHandler, messages));
} }
return true; return true;
@@ -296,12 +302,6 @@ MqttHandler::MqttHandler(UserInfo* userInfo, BusHandler* busHandler, MessageMap*
m_lastUpdateCheckResult(".") { m_lastUpdateCheckResult(".") {
m_publishByField = false; m_publishByField = false;
m_mosquitto = NULL; m_mosquitto = NULL;
int major = -1;
mosquitto_lib_version(&major, NULL, NULL);
if (major != LIBMOSQUITTO_MAJOR) {
logOtherError("mqtt", "invalid mosquitto version %d instead of %d", major, LIBMOSQUITTO_MAJOR);
return;
}
if (g_topicFields.empty()) { if (g_topicFields.empty()) {
if (g_topicStrs.empty()) { if (g_topicStrs.empty()) {
g_topicStrs.push_back(""); g_topicStrs.push_back("");