ctmesh/map
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add cli flag to drop portnums that don't have the bitfield available

Browse Source
This commit is contained in:
liamcottle
2024-09-28 09:47:26 +12:00
parent 90529f9486
commit 759567917a
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mqtt.js
View File

@ -106,6 +106,13 @@ const optionsList = [
type: Boolean, type: Boolean,
description: "This option will drop all packets that have 'OK to MQTT' set to false.", description: "This option will drop all packets that have 'OK to MQTT' set to false.",
}, },
{
name: "drop-portnums-without-bitfield",
type: Number,
multiple: true,
typeLabel: '<portnum> ...',
description: "If provided, packets with these portnums will be dropped if they don't have a bitfield. (bitfield available from firmware v2.5+)",
},
{ {
name: "purge-interval-seconds", name: "purge-interval-seconds",
type: Number, type: Number,
@ -206,6 +213,7 @@ const decryptionKeys = options["decryption-keys"] ?? [
"1PG7OiApB1nwvP+rz05pAQ==", // add default "AQ==" decryption key "1PG7OiApB1nwvP+rz05pAQ==", // add default "AQ==" decryption key
]; ];
const dropPacketsNotOkToMqtt = options["drop-packets-not-ok-to-mqtt"] ?? false; const dropPacketsNotOkToMqtt = options["drop-packets-not-ok-to-mqtt"] ?? false;
const dropPortnumsWithoutBitfield = options["drop-portnums-without-bitfield"] ?? null;
const purgeIntervalSeconds = options["purge-interval-seconds"] ?? 10; const purgeIntervalSeconds = options["purge-interval-seconds"] ?? 10;
const purgeNodesUnheardForSeconds = options["purge-nodes-unheard-for-seconds"] ?? null; const purgeNodesUnheardForSeconds = options["purge-nodes-unheard-for-seconds"] ?? null;
const purgeDeviceMetricsAfterSeconds = options["purge-device-metrics-after-seconds"] ?? null; const purgeDeviceMetricsAfterSeconds = options["purge-device-metrics-after-seconds"] ?? null;
@ -644,6 +652,9 @@ client.on("message", async (topic, message) => {
} }
} }
// get portnum from packet
const portnum = envelope.packet?.decoded?.portnum;
// check if we can see the decrypted packet data, so we can see if it has the "OK to MQTT" bitfield flag set // check if we can see the decrypted packet data, so we can see if it has the "OK to MQTT" bitfield flag set
if(envelope.packet.decoded != null){ if(envelope.packet.decoded != null){
@ -663,6 +674,17 @@ client.on("message", async (topic, message) => {
} }
// if bitfield is not available for this packet, check if we want to drop this portnum
if(bitfield == null){
// drop packet if portnum is in drop list
// this is useful for dropping specific packet types from firmware older than v2.5
if(dropPortnumsWithoutBitfield != null && dropPortnumsWithoutBitfield.includes(portnum)){
return;
}
}
} }
// create service envelope in db // create service envelope in db
@ -700,7 +722,6 @@ client.on("message", async (topic, message) => {
} }
const logKnownPacketTypes = false; const logKnownPacketTypes = false;
const portnum = envelope.packet?.decoded?.portnum;
// if allowed portnums are configured, ignore portnums that are not in the list // if allowed portnums are configured, ignore portnums that are not in the list
if(allowedPortnums != null && !allowedPortnums.includes(portnum)){ if(allowedPortnums != null && !allowedPortnums.includes(portnum)){