From e5084388333de851eb607c07f822d8d0e43b480f Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 8 Jan 2017 13:39:40 +0100 Subject: [PATCH] pass MessageMap to DataHandler --- src/ebusd/datahandler.cpp | 4 ++-- src/ebusd/datahandler.h | 3 ++- src/ebusd/mainloop.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ebusd/datahandler.cpp b/src/ebusd/datahandler.cpp index e2e67834..7d9c7950 100644 --- a/src/ebusd/datahandler.cpp +++ b/src/ebusd/datahandler.cpp @@ -51,11 +51,11 @@ const struct argp_child* datahandler_getargs() return NULL; } -bool datahandler_register(BusHandler* busHandler, list& handlers) +bool datahandler_register(BusHandler* busHandler, MessageMap* messages, list& handlers) { bool success = true; #ifdef HAVE_MQTT - DataHandler* handler = mqtthandler_register(busHandler); + DataHandler* handler = mqtthandler_register(busHandler, messages); if (handler) { handlers.push_back(handler); } else { diff --git a/src/ebusd/datahandler.h b/src/ebusd/datahandler.h index 8eb6eed7..f33fc406 100644 --- a/src/ebusd/datahandler.h +++ b/src/ebusd/datahandler.h @@ -42,10 +42,11 @@ const struct argp_child* datahandler_getargs(); /** * Registration function that is called once during initialization. * @param busHandler the @a BusHandler instance. + * @param messages the @a MessageMap instance. * @param handlers the @a list to which new @a DataHandler instances shall be added. * @return true if registration was successful. */ -bool datahandler_register(BusHandler* busHandler, list& handlers); +bool datahandler_register(BusHandler* busHandler, MessageMap* messages, list& handlers); /** diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp index d5dd6680..d4d6bf5f 100644 --- a/src/ebusd/mainloop.cpp +++ b/src/ebusd/mainloop.cpp @@ -100,7 +100,7 @@ MainLoop::MainLoop(const struct options opt, Device *device, MessageMap* message m_htmlPath = opt.htmlPath; m_network = new Network(opt.localOnly, opt.port, opt.httpPort, &m_netQueue); m_network->start("network"); - if (!datahandler_register(m_busHandler, m_dataHandlers)) { + if (!datahandler_register(m_busHandler, messages, m_dataHandlers)) { logError(lf_main, "error registering data handlers"); } }