andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

add extra {} to SubscribeItem list[1]

Browse Source
This commit is contained in:
proddy
2024-02-14 14:46:10 +01:00
parent a35486ec24
commit b6accb8d02
1 changed files with 342 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

222
lib/espMqttClient/src/Packets/Packet.cpp
View File

@@ -15,15 +15,19 @@ Packet::~Packet() {
} }
size_t Packet::available(size_t index) { size_t Packet::available(size_t index) {
if (index >= _size) return 0; if (index >= _size)
if (!_getPayload) return _size - index; return 0;
if (!_getPayload)
return _size - index;
return _chunkedAvailable(index); return _chunkedAvailable(index);
} }
const uint8_t* Packet::data(size_t index) const { const uint8_t * Packet::data(size_t index) const {
if (!_getPayload) { if (!_getPayload) {
if (!_data) return nullptr; if (!_data)
if (index >= _size) return nullptr; return nullptr;
if (index >= _size)
return nullptr;
return &_data[index]; return &_data[index];
} }
return _chunkedData(index); return _chunkedData(index);
@@ -34,9 +38,12 @@ size_t Packet::size() const {
} }
void Packet::setDup() { void Packet::setDup() {
if (!_data) return; if (!_data)
if (packetType() != PacketType.PUBLISH) return; return;
if (_packetId == 0) return; if (packetType() != PacketType.PUBLISH)
return;
if (_packetId == 0)
return;
_data[0] |= 0x08; _data[0] |= 0x08;
} }
@@ -45,36 +52,39 @@ uint16_t Packet::packetId() const {
} }
MQTTPacketType Packet::packetType() const { MQTTPacketType Packet::packetType() const {
if (_data) return static_cast<MQTTPacketType>(_data[0] & 0xF0); if (_data)
return static_cast<MQTTPacketType>(_data[0] & 0xF0);
return static_cast<MQTTPacketType>(0); return static_cast<MQTTPacketType>(0);
} }
bool Packet::removable() const { bool Packet::removable() const {
if (_packetId == 0) return true; if (_packetId == 0)
if ((packetType() == PacketType.PUBACK) || (packetType() == PacketType.PUBCOMP)) return true; return true;
if ((packetType() == PacketType.PUBACK) || (packetType() == PacketType.PUBCOMP))
return true;
return false; return false;
} }
Packet::Packet(espMqttClientTypes::Error& error, Packet::Packet(espMqttClientTypes::Error & error,
bool cleanSession, bool cleanSession,
const char* username, const char * username,
const char* password, const char * password,
const char* willTopic, const char * willTopic,
bool willRetain, bool willRetain,
uint8_t willQos, uint8_t willQos,
const uint8_t* willPayload, const uint8_t * willPayload,
uint16_t willPayloadLength, uint16_t willPayloadLength,
uint16_t keepAlive, uint16_t keepAlive,
const char* clientId) const char * clientId)
: _packetId(0) : _packetId(0)
, _data(nullptr) , _data(nullptr)
, _size(0) , _size(0)
, _payloadIndex(0) , _payloadIndex(0)
, _payloadStartIndex(0) , _payloadStartIndex(0)
, _payloadEndIndex(0) , _payloadEndIndex(0)
, _getPayload(nullptr) { , _getPayload(nullptr) {
if (willPayload && willPayloadLength == 0) { if (willPayload && willPayloadLength == 0) {
size_t length = strlen(reinterpret_cast<const char*>(willPayload)); size_t length = strlen(reinterpret_cast<const char *>(willPayload));
if (length > UINT16_MAX) { if (length > UINT16_MAX) {
emc_log_w("Payload length truncated (l:%zu)", length); emc_log_w("Payload length truncated (l:%zu)", length);
willPayloadLength = UINT16_MAX; willPayloadLength = UINT16_MAX;
@@ -89,15 +99,12 @@ Packet::Packet(espMqttClientTypes::Error& error,
} }
// Calculate size // Calculate size
size_t remainingLength = size_t remainingLength = 6 + // protocol
6 + // protocol
1 + // protocol level 1 + // protocol level
1 + // connect flags 1 + // connect flags
2 + // keepalive 2 + // keepalive
2 + strlen(clientId) + 2 + strlen(clientId) + (willTopic ? 2 + strlen(willTopic) + 2 + willPayloadLength : 0) + (username ? 2 + strlen(username) : 0)
(willTopic ? 2 + strlen(willTopic) + 2 + willPayloadLength : 0) + + (password ? 2 + strlen(password) : 0);
(username ? 2 + strlen(username) : 0) +
(password ? 2 + strlen(password) : 0);
// allocate memory // allocate memory
if (!_allocate(remainingLength, false)) { if (!_allocate(remainingLength, false)) {
@@ -114,12 +121,16 @@ Packet::Packet(espMqttClientTypes::Error& error,
pos += encodeString(PROTOCOL, &_data[pos]); pos += encodeString(PROTOCOL, &_data[pos]);
_data[pos++] = PROTOCOL_LEVEL; _data[pos++] = PROTOCOL_LEVEL;
uint8_t connectFlags = 0; uint8_t connectFlags = 0;
if (cleanSession) connectFlags |= espMqttClientInternals::ConnectFlag.CLEAN_SESSION; if (cleanSession)
if (username != nullptr) connectFlags |= espMqttClientInternals::ConnectFlag.USERNAME; connectFlags |= espMqttClientInternals::ConnectFlag.CLEAN_SESSION;
if (password != nullptr) connectFlags |= espMqttClientInternals::ConnectFlag.PASSWORD; if (username != nullptr)
connectFlags |= espMqttClientInternals::ConnectFlag.USERNAME;
if (password != nullptr)
connectFlags |= espMqttClientInternals::ConnectFlag.PASSWORD;
if (willTopic != nullptr) { if (willTopic != nullptr) {
connectFlags |= espMqttClientInternals::ConnectFlag.WILL; connectFlags |= espMqttClientInternals::ConnectFlag.WILL;
if (willRetain) connectFlags |= espMqttClientInternals::ConnectFlag.WILL_RETAIN; if (willRetain)
connectFlags |= espMqttClientInternals::ConnectFlag.WILL_RETAIN;
switch (willQos) { switch (willQos) {
case 0: case 0:
connectFlags |= espMqttClientInternals::ConnectFlag.WILL_QOS0; connectFlags |= espMqttClientInternals::ConnectFlag.WILL_QOS0;
@@ -148,28 +159,23 @@ Packet::Packet(espMqttClientTypes::Error& error,
pos += willPayloadLength; pos += willPayloadLength;
} }
// credentials // credentials
if (username != nullptr) pos += encodeString(username, &_data[pos]); if (username != nullptr)
if (password != nullptr) encodeString(password, &_data[pos]); pos += encodeString(username, &_data[pos]);
if (password != nullptr)
encodeString(password, &_data[pos]);
error = espMqttClientTypes::Error::SUCCESS; error = espMqttClientTypes::Error::SUCCESS;
} }
Packet::Packet(espMqttClientTypes::Error& error, Packet::Packet(espMqttClientTypes::Error & error, uint16_t packetId, const char * topic, const uint8_t * payload, size_t payloadLength, uint8_t qos, bool retain)
uint16_t packetId, : _packetId(packetId)
const char* topic, , _data(nullptr)
const uint8_t* payload, , _size(0)
size_t payloadLength, , _payloadIndex(0)
uint8_t qos, , _payloadStartIndex(0)
bool retain) , _payloadEndIndex(0)
: _packetId(packetId) , _getPayload(nullptr) {
, _data(nullptr) size_t remainingLength = 2 + strlen(topic) + // topic length + topic
, _size(0)
, _payloadIndex(0)
, _payloadStartIndex(0)
, _payloadEndIndex(0)
, _getPayload(nullptr) {
size_t remainingLength =
2 + strlen(topic) + // topic length + topic
2 + // packet ID 2 + // packet ID
payloadLength; payloadLength;
@@ -191,22 +197,21 @@ Packet::Packet(espMqttClientTypes::Error& error,
error = espMqttClientTypes::Error::SUCCESS; error = espMqttClientTypes::Error::SUCCESS;
} }
Packet::Packet(espMqttClientTypes::Error& error, Packet::Packet(espMqttClientTypes::Error & error,
uint16_t packetId, uint16_t packetId,
const char* topic, const char * topic,
espMqttClientTypes::PayloadCallback payloadCallback, espMqttClientTypes::PayloadCallback payloadCallback,
size_t payloadLength, size_t payloadLength,
uint8_t qos, uint8_t qos,
bool retain) bool retain)
: _packetId(packetId) : _packetId(packetId)
, _data(nullptr) , _data(nullptr)
, _size(0) , _size(0)
, _payloadIndex(0) , _payloadIndex(0)
, _payloadStartIndex(0) , _payloadStartIndex(0)
, _payloadEndIndex(0) , _payloadEndIndex(0)
, _getPayload(payloadCallback) { , _getPayload(payloadCallback) {
size_t remainingLength = size_t remainingLength = 2 + strlen(topic) + // topic length + topic
2 + strlen(topic) + // topic length + topic
2 + // packet ID 2 + // packet ID
payloadLength; payloadLength;
@@ -231,26 +236,26 @@ Packet::Packet(espMqttClientTypes::Error& error,
error = espMqttClientTypes::Error::SUCCESS; error = espMqttClientTypes::Error::SUCCESS;
} }
Packet::Packet(espMqttClientTypes::Error& error, uint16_t packetId, const char* topic, uint8_t qos) Packet::Packet(espMqttClientTypes::Error & error, uint16_t packetId, const char * topic, uint8_t qos)
: _packetId(packetId) : _packetId(packetId)
, _data(nullptr) , _data(nullptr)
, _size(0) , _size(0)
, _payloadIndex(0) , _payloadIndex(0)
, _payloadStartIndex(0) , _payloadStartIndex(0)
, _payloadEndIndex(0) , _payloadEndIndex(0)
, _getPayload(nullptr) { , _getPayload(nullptr) {
SubscribeItem list[1] = {topic, qos}; SubscribeItem list[1] = {{topic, qos}};
_createSubscribe(error, list, 1); _createSubscribe(error, list, 1);
} }
Packet::Packet(espMqttClientTypes::Error& error, MQTTPacketType type, uint16_t packetId) Packet::Packet(espMqttClientTypes::Error & error, MQTTPacketType type, uint16_t packetId)
: _packetId(packetId) : _packetId(packetId)
, _data(nullptr) , _data(nullptr)
, _size(0) , _size(0)
, _payloadIndex(0) , _payloadIndex(0)
, _payloadStartIndex(0) , _payloadStartIndex(0)
, _payloadEndIndex(0) , _payloadEndIndex(0)
, _getPayload(nullptr) { , _getPayload(nullptr) {
if (!_allocate(2)) { if (!_allocate(2)) {
error = espMqttClientTypes::Error::OUT_OF_MEMORY; error = espMqttClientTypes::Error::OUT_OF_MEMORY;
return; return;
@@ -270,26 +275,26 @@ Packet::Packet(espMqttClientTypes::Error& error, MQTTPacketType type, uint16_t p
error = espMqttClientTypes::Error::SUCCESS; error = espMqttClientTypes::Error::SUCCESS;
} }
Packet::Packet(espMqttClientTypes::Error& error, uint16_t packetId, const char* topic) Packet::Packet(espMqttClientTypes::Error & error, uint16_t packetId, const char * topic)
: _packetId(packetId) : _packetId(packetId)
, _data(nullptr) , _data(nullptr)
, _size(0) , _size(0)
, _payloadIndex(0) , _payloadIndex(0)
, _payloadStartIndex(0) , _payloadStartIndex(0)
, _payloadEndIndex(0) , _payloadEndIndex(0)
, _getPayload(nullptr) { , _getPayload(nullptr) {
const char* list[1] = {topic}; const char * list[1] = {topic};
_createUnsubscribe(error, list, 1); _createUnsubscribe(error, list, 1);
} }
Packet::Packet(espMqttClientTypes::Error& error, MQTTPacketType type) Packet::Packet(espMqttClientTypes::Error & error, MQTTPacketType type)
: _packetId(0) : _packetId(0)
, _data(nullptr) , _data(nullptr)
, _size(0) , _size(0)
, _payloadIndex(0) , _payloadIndex(0)
, _payloadStartIndex(0) , _payloadStartIndex(0)
, _payloadEndIndex(0) , _payloadEndIndex(0)
, _getPayload(nullptr) { , _getPayload(nullptr) {
if (!_allocate(0)) { if (!_allocate(0)) {
error = espMqttClientTypes::Error::OUT_OF_MEMORY; error = espMqttClientTypes::Error::OUT_OF_MEMORY;
return; return;
@@ -306,7 +311,7 @@ bool Packet::_allocate(size_t remainingLength, bool check) {
return false; return false;
} }
_size = 1 + remainingLengthLength(remainingLength) + remainingLength; _size = 1 + remainingLengthLength(remainingLength) + remainingLength;
_data = reinterpret_cast<uint8_t*>(malloc(_size)); _data = reinterpret_cast<uint8_t *>(malloc(_size));
if (!_data) { if (!_data) {
_size = 0; _size = 0;
emc_log_w("Alloc failed (l:%zu)", _size); emc_log_w("Alloc failed (l:%zu)", _size);
@@ -317,16 +322,13 @@ bool Packet::_allocate(size_t remainingLength, bool check) {
return true; return true;
} }
size_t Packet::_fillPublishHeader(uint16_t packetId, size_t Packet::_fillPublishHeader(uint16_t packetId, const char * topic, size_t remainingLength, uint8_t qos, bool retain) {
const char* topic,
size_t remainingLength,
uint8_t qos,
bool retain) {
size_t index = 0; size_t index = 0;
// FIXED HEADER // FIXED HEADER
_data[index] = PacketType.PUBLISH; _data[index] = PacketType.PUBLISH;
if (retain) _data[index] |= HeaderFlag.PUBLISH_RETAIN; if (retain)
_data[index] |= HeaderFlag.PUBLISH_RETAIN;
if (qos == 0) { if (qos == 0) {
_data[index++] |= HeaderFlag.PUBLISH_QOS0; _data[index++] |= HeaderFlag.PUBLISH_QOS0;
} else if (qos == 1) { } else if (qos == 1) {
@@ -346,9 +348,7 @@ size_t Packet::_fillPublishHeader(uint16_t packetId,
return index; return index;
} }
void Packet::_createSubscribe(espMqttClientTypes::Error& error, void Packet::_createSubscribe(espMqttClientTypes::Error & error, SubscribeItem * list, size_t numberTopics) {
SubscribeItem* list,
size_t numberTopics) {
// Calculate size // Calculate size
size_t payload = 0; size_t payload = 0;
for (size_t i = 0; i < numberTopics; ++i) { for (size_t i = 0; i < numberTopics; ++i) {
@@ -376,9 +376,7 @@ void Packet::_createSubscribe(espMqttClientTypes::Error& error,
error = espMqttClientTypes::Error::SUCCESS; error = espMqttClientTypes::Error::SUCCESS;
} }
void Packet::_createUnsubscribe(espMqttClientTypes::Error& error, void Packet::_createUnsubscribe(espMqttClientTypes::Error & error, const char ** list, size_t numberTopics) {
const char** list,
size_t numberTopics) {
// Calculate size // Calculate size
size_t payload = 0; size_t payload = 0;
for (size_t i = 0; i < numberTopics; ++i) { for (size_t i = 0; i < numberTopics; ++i) {
@@ -427,7 +425,7 @@ size_t Packet::_chunkedAvailable(size_t index) {
return _payloadEndIndex - index + 1; return _payloadEndIndex - index + 1;
} }
const uint8_t* Packet::_chunkedData(size_t index) const { const uint8_t * Packet::_chunkedData(size_t index) const {
// CAUTION!! available(index) has to be called first to check available data and possibly fill payloadbuffer // CAUTION!! available(index) has to be called first to check available data and possibly fill payloadbuffer
if (index < _payloadIndex) { if (index < _payloadIndex) {
return &_data[index]; return &_data[index];