espressif/esp-mqtt
1
0
Fork 0
mirror of https://github.com/espressif/esp-mqtt.git synced 2026-10-15 04:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of large messages (#40)

Browse Source
This commit is contained in:
Christian Gawron
2018-05-03 20:46:06 +07:00
committed by Tuan
parent c837f9cc5f
commit 4bc37bb8db
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/include/mqtt_msg.h
+4 -4
View File
@@ -71,7 +71,7 @@ enum mqtt_connect_return_code
typedef struct mqtt_message
{
uint8_t* data;
uint16_t length;
uint32_t length;
} mqtt_message_t;
@@ -108,9 +108,9 @@ static inline int mqtt_get_qos(uint8_t* buffer) { return (buffer[0] & 0x06) >> 1
static inline int mqtt_get_retain(uint8_t* buffer) { return (buffer[0] & 0x01); }
void mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length);
int mqtt_get_total_length(uint8_t* buffer, uint16_t length);
const char* mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length);
const char* mqtt_get_publish_data(uint8_t* buffer, uint16_t* length);
uint32_t mqtt_get_total_length(uint8_t* buffer, uint16_t length);
const char* mqtt_get_publish_topic(uint8_t* buffer, uint32_t* length);
const char* mqtt_get_publish_data(uint8_t* buffer, uint32_t* length);
uint16_t mqtt_get_id(uint8_t* buffer, uint16_t length);
mqtt_message_t* mqtt_msg_connect(mqtt_connection_t* connection, mqtt_connect_info_t* info);
lib/mqtt_msg.c
+6 -6
View File
@@ -133,10 +133,10 @@ void mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buff
connection->buffer_length = buffer_length;
}
int mqtt_get_total_length(uint8_t* buffer, uint16_t length)
uint32_t mqtt_get_total_length(uint8_t* buffer, uint16_t length)
{
int i;
int totlen = 0;
uint32_t totlen = 0;
for (i = 1; i < length; ++i)
{
@@ -148,11 +148,11 @@ int mqtt_get_total_length(uint8_t* buffer, uint16_t length)
}
}
totlen += i;
return totlen;
}
const char* mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length)
const char* mqtt_get_publish_topic(uint8_t* buffer, uint32_t* length)
{
int i;
int totlen = 0;
@@ -179,9 +179,9 @@ const char* mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length)
*length = topiclen;
return (const char*)(buffer + i);
}
}
const char* mqtt_get_publish_data(uint8_t* buffer, uint16_t* length)
const char* mqtt_get_publish_data(uint8_t* buffer, uint32_t* length)
{
int i;
int totlen = 0;