pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-21 17:20:01 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

s/ptr/channelName/

Browse Source
This commit is contained in:
Eric Severance 2024-12-16 21:59:19 -08:00
parent d9b900b287
commit c5d3f07b84
No known key found for this signature in database
GPG Key ID: 340D1DA2A5A64A62
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mqtt/MQTT.cpp
View File

@ -126,7 +126,7 @@ inline bool isValidJsonEnvelope(JSONObject &json)
(json.find("payload") != json.end()); // should have a payload (json.find("payload") != json.end()); // should have a payload
} }
inline void onReceiveJson(char *topic, byte *payload, size_t length) inline void onReceiveJson(char *channelName, byte *payload, size_t length)
{ {
// check if this is a json payload message by comparing the topic start // check if this is a json payload message by comparing the topic start
char payloadStr[length + 1]; char payloadStr[length + 1];
@ -142,7 +142,7 @@ inline void onReceiveJson(char *topic, byte *payload, size_t length)
JSONObject json; JSONObject json;
json = json_value->AsObject(); json = json_value->AsObject();
meshtastic_Channel sendChannel = channels.getByName(topic); meshtastic_Channel sendChannel = channels.getByName(channelName);
// We allow downlink JSON packets only on a channel named "mqtt" // We allow downlink JSON packets only on a channel named "mqtt"
if (!(strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 && if (!(strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 &&
sendChannel.settings.downlink_enabled)) { sendChannel.settings.downlink_enabled)) {
@ -230,9 +230,10 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
if (moduleConfig.mqtt.json_enabled && (strncmp(topic, jsonTopic.c_str(), jsonTopic.length()) == 0)) { if (moduleConfig.mqtt.json_enabled && (strncmp(topic, jsonTopic.c_str(), jsonTopic.length()) == 0)) {
// parse the channel name from the topic string // parse the channel name from the topic string
// the topic has been checked above for having jsonTopic prefix, so just move past it // the topic has been checked above for having jsonTopic prefix, so just move past it
char *ptr = topic + jsonTopic.length(); char *channelName = topic + jsonTopic.length();
ptr = strtok(ptr, "/") ? strtok(ptr, "/") : ptr; // if another "/" was added, parse string up to that character // if another "/" was added, parse string up to that character
onReceiveJson(ptr, payload, length); channelName = strtok(channelName, "/") ? strtok(channelName, "/") : channelName;
onReceiveJson(channelName, payload, length);
} else { } else {
onReceiveProto(topic, payload, length); onReceiveProto(topic, payload, length);
} }