+2
-2
@@ -185,7 +185,7 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
|
|||||||
statusTopic = moduleConfig.mqtt.root + statusTopic;
|
statusTopic = moduleConfig.mqtt.root + statusTopic;
|
||||||
cryptTopic = moduleConfig.mqtt.root + cryptTopic;
|
cryptTopic = moduleConfig.mqtt.root + cryptTopic;
|
||||||
jsonTopic = moduleConfig.mqtt.root + jsonTopic;
|
jsonTopic = moduleConfig.mqtt.root + jsonTopic;
|
||||||
mapTopic = moduleConfig.mqtt.root + jsonTopic;
|
mapTopic = moduleConfig.mqtt.root + mapTopic;
|
||||||
} else {
|
} else {
|
||||||
statusTopic = "msh" + statusTopic;
|
statusTopic = "msh" + statusTopic;
|
||||||
cryptTopic = "msh" + cryptTopic;
|
cryptTopic = "msh" + cryptTopic;
|
||||||
@@ -915,4 +915,4 @@ bool MQTT::isValidJsonEnvelope(JSONObject &json)
|
|||||||
(json["from"]->AsNumber() == nodeDB.getNodeNum()) && // only accept message if the "from" is us
|
(json["from"]->AsNumber() == nodeDB.getNodeNum()) && // only accept message if the "from" is us
|
||||||
(json.find("type") != json.end()) && json["type"]->IsString() && // should specify a type
|
(json.find("type") != json.end()) && json["type"]->IsString() && // should specify a type
|
||||||
(json.find("payload") != json.end()); // should have a payload
|
(json.find("payload") != json.end()); // should have a payload
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user