mgillespie/TinyMqtt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unique_ptr and more use of debug() macro

Browse Source
This commit is contained in:
Francois BIOT
2022-12-29 18:17:45 +01:00
parent 8162b4c35b
commit 1a66d2c991
2 changed files with 42 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/TinyMqtt.cpp
View File

@@ -17,21 +17,12 @@ int TinyMqtt::debug=2;
MqttBroker::MqttBroker(uint16_t port) MqttBroker::MqttBroker(uint16_t port)
{ {
server = new TcpServer(port); server = std::make_unique<TcpServer>(port);
#ifdef TINY_MQTT_ASYNC #ifdef TINY_MQTT_ASYNC
server->onClient(onClient, this); server->onClient(onClient, this);
#endif #endif
} }
MqttBroker::~MqttBroker()
{
while(clients.size())
{
delete clients[0];
}
delete server;
}
// private constructor used by broker only // private constructor used by broker only
MqttClient::MqttClient(MqttBroker* local_broker, TcpClient* new_client) MqttClient::MqttClient(MqttBroker* local_broker, TcpClient* new_client)
{ {
@@ -43,7 +34,7 @@ MqttClient::MqttClient(MqttBroker* local_broker, TcpClient* new_client)
// client->onConnect() TODO // client->onConnect() TODO
// client->onDisconnect() TODO // client->onDisconnect() TODO
#else #else
tcp_client = new WiFiClient(*new_client); tcp_client = std::make_unique<WiFiClient>(*new_client);
#endif #endif
alive = millis()+5000; alive = millis()+5000;
} }
@@ -59,7 +50,6 @@ MqttClient::MqttClient(MqttBroker* local_broker, const std::string& id)
MqttClient::~MqttClient() MqttClient::~MqttClient()
{ {
close(); close();
delete tcp_client;
debug("*** MqttClient delete()"); debug("*** MqttClient delete()");
} }
@@ -99,8 +89,7 @@ void MqttClient::connect(std::string broker, uint16_t port, uint16_t ka)
debug("MqttClient::connect_to_host " << broker << ':' << port); debug("MqttClient::connect_to_host " << broker << ':' << port);
keep_alive = ka; keep_alive = ka;
close(); close();
if (tcp_client) delete tcp_client; tcp_client = std::make_unique<TcpClient>();
tcp_client = new TcpClient;
#ifdef TINY_MQTT_ASYNC #ifdef TINY_MQTT_ASYNC
tcp_client->onData(onData, this); tcp_client->onData(onData, this);
@@ -110,7 +99,7 @@ void MqttClient::connect(std::string broker, uint16_t port, uint16_t ka)
if (tcp_client->connect(broker.c_str(), port)) if (tcp_client->connect(broker.c_str(), port))
{ {
debug("link established"); debug("link established");
onConnect(this, tcp_client); onConnect(this, tcp_client.get());
} }
else else
{ {
@@ -119,10 +108,10 @@ void MqttClient::connect(std::string broker, uint16_t port, uint16_t ka)
#endif #endif
} }
void MqttBroker::addClient(MqttClient* client) void MqttBroker::addClient(TcpClient* client)
{ {
debug("MqttBroker::addClient"); debug("MqttBroker::addClient");
clients.push_back(client); clients.insert(std::unique_ptr<MqttClient>(new MqttClient(this, client)));
} }
void MqttBroker::connect(const std::string& host, uint16_t port) void MqttBroker::connect(const std::string& host, uint16_t port)
@@ -135,24 +124,7 @@ void MqttBroker::connect(const std::string& host, uint16_t port)
void MqttBroker::removeClient(MqttClient* remove) void MqttBroker::removeClient(MqttClient* remove)
{ {
debug("removeClient"); local_clients.erase(remove);
for(auto it=clients.begin(); it!=clients.end(); it++)
{
auto client=*it;
if (client==remove)
{
// TODO if this broker is connected to an external broker
// we have to unsubscribe remove's topics.
// (but doing this, check that other clients are not subscribed...)
// Unless -> we could receive useless messages
// -> we are using (memory) one IndexedString plus its string for nothing.
debug("Remove " << clients.size());
clients.erase(it);
debug("Client removed " << clients.size());
return;
}
}
debug(red << "Error cannot remove client"); // TODO should not occur
} }
void MqttBroker::onClient(void* broker_ptr, TcpClient* client) void MqttBroker::onClient(void* broker_ptr, TcpClient* client)
@@ -160,7 +132,7 @@ void MqttBroker::onClient(void* broker_ptr, TcpClient* client)
debug("MqttBroker::onClient"); debug("MqttBroker::onClient");
MqttBroker* broker = static_cast<MqttBroker*>(broker_ptr); MqttBroker* broker = static_cast<MqttBroker*>(broker_ptr);
broker->addClient(new MqttClient(broker, client)); broker->addClient(client);
debug("New client"); debug("New client");
} }
@@ -181,21 +153,18 @@ void MqttBroker::loop()
remote_broker->loop(); remote_broker->loop();
} }
for(size_t i=0; i<clients.size(); i++) // 200 bytes shorter than for(auto& client: clients) !
for(auto it=clients.begin(); it!=clients.end(); it++)
{ {
MqttClient* client = clients[i]; it->get()->loop();
if (client->connected()) if (not it->get()->connected())
{ {
client->loop(); clients.erase(it);
}
else
{
debug("Client " << client->id().c_str() << " Disconnected, local_broker=" << (dbg_ptr)client->local_broker);
// Note: deleting a client not added by the broker itself will probably crash later.
delete client;
break; break;
} }
} }
for(const auto& client: local_clients)
client->loop();
} }
MqttError MqttBroker::subscribe(const Topic& topic, uint8_t qos) MqttError MqttBroker::subscribe(const Topic& topic, uint8_t qos)
@@ -213,14 +182,13 @@ MqttError MqttBroker::publish(const MqttClient* source, const Topic& topic, Mqtt
MqttError retval = MqttOk; MqttError retval = MqttOk;
debug("MqttBroker::publish"); debug("MqttBroker::publish");
int i=0; int clt_num = 0;
for(auto client: clients) for(auto& client: clients)
{ {
i++; debug (" broker:" << (remote_broker && remote_broker->connected() ? "linked" : "alone")
#if TINY_MQTT_DEBUG << " srce=" << (source->isLocal() ? "loc" : "rem") << " clt#" << ++clt_num
Console << __LINE__ << " broker:" << (remote_broker && remote_broker->connected() ? "linked" : "alone") << << ", local=" << client->isLocal() << ", con=" << client->connected());
" srce=" << (source->isLocal() ? "loc" : "rem") << " clt#" << i << ", local=" << client->isLocal() << ", con=" << client->connected() << endl;
#endif
bool doit = false; bool doit = false;
if (remote_broker && remote_broker->connected()) // this (MqttBroker) is connected (to a external broker) if (remote_broker && remote_broker->connected()) // this (MqttBroker) is connected (to a external broker)
{ {
@@ -238,9 +206,8 @@ MqttError MqttBroker::publish(const MqttClient* source, const Topic& topic, Mqtt
{ {
doit = true; doit = true;
} }
#if TINY_MQTT_DEBUG
Console << ", doit=" << doit << ' '; debug(" doit=" << doit << ' ');
#endif
if (doit) retval = client->publishIfSubscribed(topic, msg); if (doit) retval = client->publishIfSubscribed(topic, msg);
debug(""); debug("");
@@ -359,7 +326,7 @@ void MqttClient::resubscribe()
msg.add(0); msg.add(0);
msg.add(0); msg.add(0);
for(auto topic: subscriptions) for(const auto& topic: subscriptions)
{ {
msg.add(topic); msg.add(topic);
msg.add(0); // TODO qos msg.add(0); // TODO qos
@@ -481,9 +448,8 @@ void MqttClient::processMessage(MqttMessage* mesg)
payload += len; payload += len;
} }
#if TINY_MQTT_DEBUG debug(yellow << "Client " << clientId << " connected : keep alive=" << keep_alive << '.' << white);
Console << yellow << "Client " << clientId << " connected : keep alive=" << keep_alive << '.' << white << endl;
#endif
bclose = false; bclose = false;
mqtt_flags |= FlagConnected; mqtt_flags |= FlagConnected;
{ {
@@ -579,9 +545,7 @@ void MqttClient::processMessage(MqttMessage* mesg)
break; break;
case MqttMessage::Type::Publish: case MqttMessage::Type::Publish:
#if TINY_MQTT_DEBUG debug("publish " << (mqtt_flags & FlagConnected) << '/' << (long) tcp_client.get());
Console << "publish " << (mqtt_flags & FlagConnected) << '/' << (long) tcp_client << endl;
#endif
if ((mqtt_flags & FlagConnected) or tcp_client == nullptr) if ((mqtt_flags & FlagConnected) or tcp_client == nullptr)
{ {
uint8_t qos = mesg->flags(); uint8_t qos = mesg->flags();
@@ -589,9 +553,7 @@ void MqttClient::processMessage(MqttMessage* mesg)
mesg->getString(payload, len); mesg->getString(payload, len);
Topic published(payload, len); Topic published(payload, len);
payload += len; payload += len;
#if TINY_MQTT_DEBUG debug("Received Publish (" << published.str().c_str() << ") size=" << (int)len);
Console << "Received Publish (" << published.str().c_str() << ") size=" << (int)len << endl;
#endif
// << '(' << std::string(payload, len).c_str() << ')' << " msglen=" << mesg->length() << endl; // << '(' << std::string(payload, len).c_str() << ')' << " msglen=" << mesg->length() << endl;
if (qos) payload+=2; // ignore packet identifier if any if (qos) payload+=2; // ignore packet identifier if any
len=mesg->end()-payload; len=mesg->end()-payload;
@@ -743,10 +705,7 @@ MqttError MqttClient::publishIfSubscribed(const Topic& topic, MqttMessage& msg)
else else
{ {
processMessage(&msg); processMessage(&msg);
debug("Should call the callback ?");
#if TINY_MQTT_DEBUG
Console << "Should call the callback ?\n";
#endif
// callback(this, topic, nullptr, 0); // TODO Payload // callback(this, topic, nullptr, 0); // TODO Payload
} }
} }

24
src/TinyMqtt.h
View File

@@ -37,7 +37,7 @@
#include <rpcWiFi.h> #include <rpcWiFi.h>
#endif #endif
#include <vector> #include <memory>
#include <set> #include <set>
#include <string> #include <string>
#include "StringIndexer.h" #include "StringIndexer.h"
@@ -52,7 +52,7 @@
static int debug; static int debug;
}; };
#define debug(what) { if (TinyMqtt::debug>=1) Console << (int)__LINE__ << ' ' << what << TinyConsole::white << endl; delay(100); } #define debug(what) { if (TinyMqtt::debug>=1) Console << (int)__LINE__ << ' ' << what << TinyConsole::white << endl; delay(10); }
#else #else
#define debug(what) {} #define debug(what) {}
#endif #endif
@@ -303,7 +303,7 @@ class MqttClient
// when MqttBroker uses MqttClient for each external connexion // when MqttBroker uses MqttClient for each external connexion
MqttBroker* local_broker=nullptr; MqttBroker* local_broker=nullptr;
TcpClient* tcp_client=nullptr; // connection to remote broker std::unique_ptr<TcpClient> tcp_client; // connection to remote broker
std::set<Topic> subscriptions; std::set<Topic> subscriptions;
std::string clientId; std::string clientId;
CallBack callback = nullptr; CallBack callback = nullptr;
@@ -320,7 +320,6 @@ class MqttBroker
public: public:
// TODO limit max number of clients // TODO limit max number of clients
MqttBroker(uint16_t port); MqttBroker(uint16_t port);
~MqttBroker();
void begin() { server->begin(); } void begin() { server->begin(); }
void loop(); void loop();
@@ -332,11 +331,12 @@ class MqttBroker
void dump(std::string indent="") void dump(std::string indent="")
{ {
for(auto client: clients) for(const auto& client: clients)
client->dump(indent); client->dump(indent);
} }
const std::vector<MqttClient*> getClients() const { return clients; } using Clients = std::set<std::unique_ptr<MqttClient>>;
const Clients& getClients() const { return clients; }
private: private:
friend class MqttClient; friend class MqttClient;
@@ -353,15 +353,17 @@ class MqttBroker
MqttError subscribe(const Topic& topic, uint8_t qos); MqttError subscribe(const Topic& topic, uint8_t qos);
// For clients that are added not by the broker itself (local clients) void addClient(MqttClient* local) { local_clients.insert(local); }
void addClient(MqttClient* client); void addClient(TcpClient* client);
void removeClient(MqttClient* client);
void removeClient(MqttClient* local);
bool compareString(const char* good, const char* str, uint8_t str_len) const; bool compareString(const char* good, const char* str, uint8_t str_len) const;
std::vector<MqttClient*> clients; Clients clients;
std::set<MqttClient*> local_clients;
private: private:
TcpServer* server = nullptr; std::unique_ptr<TcpServer> server;
const char* auth_user = "guest"; const char* auth_user = "guest";
const char* auth_password = "guest"; const char* auth_password = "guest";