forked from meshtastic/firmware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'meshtastic:master' into master
- Loading branch information
Showing
13 changed files
with
235 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| #include "AtakPluginModule.h" | ||
| #include "MeshService.h" | ||
| #include "NodeDB.h" | ||
| #include "PowerFSM.h" | ||
| #include "configuration.h" | ||
| #include "main.h" | ||
| #include "meshtastic/atak.pb.h" | ||
|
|
||
| extern "C" { | ||
| #include "mesh/compression/unishox2.h" | ||
| } | ||
|
|
||
| AtakPluginModule *atakPluginModule; | ||
|
|
||
| AtakPluginModule::AtakPluginModule() | ||
| : ProtobufModule("atak", meshtastic_PortNum_ATAK_PLUGIN, &meshtastic_TAKPacket_msg), concurrency::OSThread("AtakPluginModule") | ||
| { | ||
| ourPortNum = meshtastic_PortNum_ATAK_PLUGIN; | ||
| } | ||
|
|
||
| /* | ||
| Encompasses the full construction and sending packet to mesh | ||
| Will be used for broadcast. | ||
| */ | ||
| int32_t AtakPluginModule::runOnce() | ||
| { | ||
| return default_broadcast_interval_secs; | ||
| } | ||
|
|
||
| bool AtakPluginModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *r) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| meshtastic_TAKPacket AtakPluginModule::cloneTAKPacketData(meshtastic_TAKPacket *t) | ||
| { | ||
| meshtastic_TAKPacket clone = meshtastic_TAKPacket_init_zero; | ||
| if (t->has_group) { | ||
| clone.has_group = true; | ||
| clone.group = t->group; | ||
| } | ||
| if (t->has_status) { | ||
| clone.has_status = true; | ||
| clone.status = t->status; | ||
| } | ||
| if (t->has_contact) { | ||
| clone.has_contact = true; | ||
| clone.contact = {0}; | ||
| } | ||
|
|
||
| if (t->which_payload_variant == meshtastic_TAKPacket_pli_tag) { | ||
| clone.which_payload_variant = meshtastic_TAKPacket_pli_tag; | ||
| clone.payload_variant.pli = t->payload_variant.pli; | ||
| } else if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) { | ||
| clone.which_payload_variant = meshtastic_TAKPacket_chat_tag; | ||
| clone.payload_variant.chat = {0}; | ||
| } | ||
|
|
||
| return clone; | ||
| } | ||
|
|
||
| void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) | ||
| { | ||
| // From Phone (EUD) | ||
| if (mp.from == 0) { | ||
| LOG_DEBUG("Received uncompressed TAK payload from phone with %d bytes\n", mp.decoded.payload.size); | ||
| // Compress for LoRA transport | ||
| auto compressed = cloneTAKPacketData(t); | ||
| compressed.is_compressed = true; | ||
| if (t->has_contact) { | ||
| auto length = unishox2_compress_simple(t->contact.callsign, strlen(t->contact.callsign), compressed.contact.callsign); | ||
| LOG_DEBUG("Uncompressed callsign '%s' - %d bytes\n", t->contact.callsign, strlen(t->contact.callsign)); | ||
| LOG_DEBUG("Compressed callsign '%s' - %d bytes\n", t->contact.callsign, length); | ||
|
|
||
| length = unishox2_compress_simple(t->contact.device_callsign, strlen(t->contact.device_callsign), | ||
| compressed.contact.device_callsign); | ||
| LOG_DEBUG("Uncompressed device_callsign '%s' - %d bytes\n", t->contact.device_callsign, | ||
| strlen(t->contact.device_callsign)); | ||
| LOG_DEBUG("Compressed device_callsign '%s' - %d bytes\n", compressed.contact.device_callsign, length); | ||
| } | ||
| if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) { | ||
| auto length = unishox2_compress_simple(t->payload_variant.chat.message, strlen(t->payload_variant.chat.message), | ||
| compressed.payload_variant.chat.message); | ||
| LOG_DEBUG("Uncompressed chat message '%s' - %d bytes\n", t->payload_variant.chat.message, | ||
| strlen(t->payload_variant.chat.message)); | ||
| LOG_DEBUG("Compressed chat message '%s' - %d bytes\n", compressed.payload_variant.chat.message, length); | ||
| } | ||
| mp.decoded.payload.size = pb_encode_to_bytes(mp.decoded.payload.bytes, sizeof(mp.decoded.payload.bytes), | ||
| meshtastic_TAKPacket_fields, &compressed); | ||
| LOG_DEBUG("Final payload size of %d bytes\n", mp.decoded.payload.size); | ||
| } else { | ||
| if (!t->is_compressed) { | ||
| // Not compressed. Something is wrong | ||
| LOG_ERROR("Received uncompressed TAKPacket over radio!\n"); | ||
| return; | ||
| } | ||
|
|
||
| // Decompress for Phone (EUD) | ||
| auto decompressedCopy = packetPool.allocCopy(mp); | ||
| auto uncompressed = cloneTAKPacketData(t); | ||
| uncompressed.is_compressed = false; | ||
| if (t->has_contact) { | ||
| auto length = | ||
| unishox2_decompress_simple(t->contact.callsign, strlen(t->contact.callsign), uncompressed.contact.callsign); | ||
|
|
||
| LOG_DEBUG("Compressed callsign: %d bytes\n", strlen(t->contact.callsign)); | ||
| LOG_DEBUG("Decompressed callsign: '%s' @ %d bytes\n", uncompressed.contact.callsign, length); | ||
|
|
||
| length = unishox2_decompress_simple(t->contact.device_callsign, strlen(t->contact.device_callsign), | ||
| uncompressed.contact.device_callsign); | ||
|
|
||
| LOG_DEBUG("Compressed device_callsign: %d bytes\n", strlen(t->contact.device_callsign)); | ||
| LOG_DEBUG("Decompressed device_callsign: '%s' @ %d bytes\n", uncompressed.contact.device_callsign, length); | ||
| } | ||
| if (uncompressed.which_payload_variant == meshtastic_TAKPacket_chat_tag) { | ||
| auto length = unishox2_decompress_simple(t->payload_variant.chat.message, strlen(t->payload_variant.chat.message), | ||
| uncompressed.payload_variant.chat.message); | ||
| LOG_DEBUG("Compressed chat message: %d bytes\n", strlen(t->payload_variant.chat.message)); | ||
| LOG_DEBUG("Decompressed chat message: '%s' @ %d bytes\n", uncompressed.payload_variant.chat.message, length); | ||
| } | ||
| decompressedCopy->decoded.payload.size = | ||
| pb_encode_to_bytes(decompressedCopy->decoded.payload.bytes, sizeof(decompressedCopy->decoded.payload), | ||
| meshtastic_TAKPacket_fields, &uncompressed); | ||
|
|
||
| service.sendToPhone(decompressedCopy); | ||
| } | ||
| return; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #pragma once | ||
| #include "ProtobufModule.h" | ||
| #include "meshtastic/atak.pb.h" | ||
|
|
||
| /** | ||
| * Waypoint message handling for meshtastic | ||
| */ | ||
| class AtakPluginModule : public ProtobufModule<meshtastic_TAKPacket>, private concurrency::OSThread | ||
| { | ||
| public: | ||
| /** Constructor | ||
| * name is for debugging output | ||
| */ | ||
| AtakPluginModule(); | ||
|
|
||
| protected: | ||
| virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override; | ||
| virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override; | ||
| /* Does our periodic broadcast */ | ||
| int32_t runOnce() override; | ||
|
|
||
| private: | ||
| meshtastic_TAKPacket cloneTAKPacketData(meshtastic_TAKPacket *t); | ||
| }; | ||
|
|
||
| extern AtakPluginModule *atakPluginModule; |
Oops, something went wrong.