JDierkse/MQTT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Message and Cleanup

Browse Source
This commit is contained in:
JDierkse
2020-06-12 11:52:57 +02:00
parent 859e336eca
commit 8422bc503d
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MQTT/MQTT.cpp
+2 -1
View File
@@ -13,7 +13,7 @@ MQTT::~MQTT()
{ {
} }
bool MQTT::Send(const Message& message) bool MQTT::Send(const MQTTMessage& message)
{ {
return m_pMQTTImpl->Send(message); return m_pMQTTImpl->Send(message);
} }
@@ -39,3 +39,4 @@ void MQTT::Disconnect(size_t connection)
} }
} // namespace MQTT } // namespace MQTT
MQTT/MQTTImpl.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ MQTTImpl::~MQTTImpl()
mosquitto_lib_cleanup(); mosquitto_lib_cleanup();
} }
bool MQTTImpl::Send(const Message& message) bool MQTTImpl::Send(const MQTTMessage& message)
{ {
if (m_connected) if (m_connected)
return (MOSQ_ERR_SUCCESS == mosquitto_publish(m_pMosquitto, NULL, message.topic.c_str(), message.payload.length(), message.payload.c_str(), 0, 0)); return (MOSQ_ERR_SUCCESS == mosquitto_publish(m_pMosquitto, NULL, message.topic.c_str(), message.payload.length(), message.payload.c_str(), 0, 0));
@@ -154,7 +154,7 @@ void MQTTImpl::ConnectCallback(int result)
void MQTTImpl::MessageCallback(const mosquitto_message* pMessage) void MQTTImpl::MessageCallback(const mosquitto_message* pMessage)
{ {
Message message; MQTTMessage message;
message.topic = std::string(pMessage->topic); message.topic = std::string(pMessage->topic);
message.payload = std::string(static_cast<char*>(pMessage->payload), pMessage->payloadlen); message.payload = std::string(static_cast<char*>(pMessage->payload), pMessage->payloadlen);
MQTT/MQTTImpl.h
+3 -3
View File
@@ -1,8 +1,8 @@
#ifndef MQTT_MQTTIMPL_H #ifndef MQTT_MQTTIMPL_H
#define MQTT_MQTTIMPL_H #define MQTT_MQTTIMPL_H
#include "Message.h"
#include "MQTT.h" #include "MQTT.h"
#include "MQTTMessage.h"
#include <SimpleSignal.h> #include <SimpleSignal.h>
#include <mutex> #include <mutex>
#include <string> #include <string>
@@ -20,14 +20,14 @@ public:
MQTTImpl(const std::string& hostname, int port); MQTTImpl(const std::string& hostname, int port);
~MQTTImpl(); ~MQTTImpl();
bool Send(const Message& message); bool Send(const MQTTMessage& message);
bool Subscribe(const std::string& topic); bool Subscribe(const std::string& topic);
void Unsubscribe(const std::string& topic); void Unsubscribe(const std::string& topic);
size_t Connect(MQTT::CallbackMethod function); size_t Connect(MQTT::CallbackMethod function);
void Disconnect(size_t connection); void Disconnect(size_t connection);
private: private:
typedef Simple::Signal<void(const Message&)> MessageSignal; typedef Simple::Signal<void(const MQTTMessage&)> MessageSignal;
private: private:
static void ConnectCallback(mosquitto* pMosquitto, void* pObject, int result); static void ConnectCallback(mosquitto* pMosquitto, void* pObject, int result);
include/MQTT.h
+3 -3
View File
@@ -1,7 +1,7 @@
#ifndef MQTT_H #ifndef MQTT_H
#define MQTT_H #define MQTT_H
#include "Message.h" #include "MQTTMessage.h"
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <string> #include <string>
@@ -18,10 +18,10 @@ public:
~MQTT(); ~MQTT();
public: public:
typedef std::function<void(const Message&)> CallbackMethod; typedef std::function<void(const MQTTMessage&)> CallbackMethod;
public: public:
bool Send(const Message& message); bool Send(const MQTTMessage& message);
bool Subscribe(const std::string& topic); bool Subscribe(const std::string& topic);
void Unsubscribe(const std::string& topic); void Unsubscribe(const std::string& topic);
size_t Connect(CallbackMethod function); size_t Connect(CallbackMethod function);
include/Message.h → include/MQTTMessage.h
+4 -4
View File
@@ -1,12 +1,12 @@
#ifndef MESSAGE_H #ifndef MQTTMESSAGE_H
#define MESSAGE_H #define MQTTMESSAGE_H
#include <string> #include <string>
namespace MQTT { namespace MQTT {
struct Message struct MQTTMessage
{ {
std::string topic; std::string topic;
std::string payload; std::string payload;
@@ -14,4 +14,4 @@ struct Message
} // namespace MQTT } // namespace MQTT
#endif // MESSAGE_H #endif // MQTTMESSAGE_H