MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MQTT: Removed need for new topic buffer

Browse Source
This commit is contained in:
frizzy
2016-11-04 19:42:34 +00:00
parent e21df64845
commit 2321c67ffa
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/MyProtocolMySensors.cpp
+1 -8
View File
@@ -120,18 +120,11 @@ bool protocolMQTTParse(MyMessage &message, char* topic, uint8_t* payload, unsign
uint8_t bvalue[MAX_PAYLOAD]; uint8_t bvalue[MAX_PAYLOAD];
uint8_t blen = 0; uint8_t blen = 0;
uint8_t command = 0; uint8_t command = 0;
uint8_t topiclen = strlen(topic) - strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX);
char topicTrimmed[topiclen];
if (topic != strstr(topic, MY_MQTT_SUBSCRIBE_TOPIC_PREFIX)) { if (topic != strstr(topic, MY_MQTT_SUBSCRIBE_TOPIC_PREFIX)) {
// Prefix doesn't match incoming topic // Prefix doesn't match incoming topic
return false; return false;
} }
// Extract the topic sans prefix for (str = strtok_r(topic + strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + 1, "/", &p); str && i <= 5;
strncpy(topicTrimmed, &topic[strlen(MY_MQTT_SUBSCRIBE_TOPIC_PREFIX) + 1], topiclen);
topicTrimmed[topiclen] = (char)0;
for (str = strtok_r(topicTrimmed, "/", &p); str && i <= 5;
str = strtok_r(NULL, "/", &p)) { str = strtok_r(NULL, "/", &p)) {
switch (i) { switch (i) {
case 0: { case 0: {