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

Reorder 'if's to avoid object creation

Browse Source
This commit is contained in:
Eric Severance 2024-12-17 11:17:35 -08:00
parent 9712cc22c6
commit 3f79dd0139
No known key found for this signature in database
GPG Key ID: 340D1DA2A5A64A62
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mqtt/MQTT.cpp
View File

@ -82,14 +82,14 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
} }
LOG_INFO("Received MQTT topic %s, len=%u", topic, length); LOG_INFO("Received MQTT topic %s, len=%u", topic, length);
UniquePacketPoolPacket p = packetPool.allocUniqueCopy(*e.packet); if (isFromUs(e.packet)) {
p->via_mqtt = true; // Mark that the packet was received via MQTT
if (isFromUs(p.get())) {
LOG_INFO("Ignore downlink message we originally sent"); LOG_INFO("Ignore downlink message we originally sent");
return; return;
} }
UniquePacketPoolPacket p = packetPool.allocUniqueCopy(*e.packet);
p->via_mqtt = true; // Mark that the packet was received via MQTT
if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) { if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
if (moduleConfig.mqtt.encryption_enabled) { if (moduleConfig.mqtt.encryption_enabled) {
LOG_INFO("Ignore decoded message on MQTT, encryption is enabled"); LOG_INFO("Ignore decoded message on MQTT, encryption is enabled");
@ -126,9 +126,8 @@ 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 *channelName, byte *payload, size_t length) inline void onReceiveJson(byte *payload, size_t length)
{ {
// check if this is a json payload message by comparing the topic start
char payloadStr[length + 1]; char payloadStr[length + 1];
memcpy(payloadStr, payload, length); memcpy(payloadStr, payload, length);
payloadStr[length] = 0; // null terminated string payloadStr[length] = 0; // null terminated string
@ -142,14 +141,6 @@ inline void onReceiveJson(char *channelName, byte *payload, size_t length)
JSONObject json; JSONObject json;
json = json_value->AsObject(); json = json_value->AsObject();
meshtastic_Channel sendChannel = channels.getByName(channelName);
// We allow downlink JSON packets only on a channel named "mqtt"
if (!(strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 &&
sendChannel.settings.downlink_enabled)) {
LOG_WARN("JSON downlink received on channel not called 'mqtt' or without downlink enabled");
return;
}
if (!isValidJsonEnvelope(json)) { if (!isValidJsonEnvelope(json)) {
LOG_ERROR("JSON received payload on MQTT but not a valid envelope"); LOG_ERROR("JSON received payload on MQTT but not a valid envelope");
return; return;
@ -227,13 +218,21 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
LOG_WARN("Empty MQTT payload received, topic %s!", topic); LOG_WARN("Empty MQTT payload received, topic %s!", topic);
return; return;
} }
// check if this is a json payload message by comparing the topic start
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 *channelName = topic + jsonTopic.length(); char *channelName = topic + jsonTopic.length();
// if another "/" was added, parse string up to that character // if another "/" was added, parse string up to that character
channelName = strtok(channelName, "/") ? strtok(channelName, "/") : channelName; channelName = strtok(channelName, "/") ? strtok(channelName, "/") : channelName;
onReceiveJson(channelName, payload, length); // We allow downlink JSON packets only on a channel named "mqtt"
meshtastic_Channel &sendChannel = channels.getByName(channelName);
if (!(strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 &&
sendChannel.settings.downlink_enabled)) {
LOG_WARN("JSON downlink received on channel not called 'mqtt' or without downlink enabled");
return;
}
onReceiveJson(payload, length);
} else { } else {
onReceiveProto(topic, payload, length); onReceiveProto(topic, payload, length);
} }