From 3ba76bbe4c98ee9c9e422d8dc10844cc9fb5272a Mon Sep 17 00:00:00 2001 From: geeksville Date: Sat, 6 Jun 2020 13:15:15 -0700 Subject: [PATCH] change to use 32 bit nodenums/packetids --- mesh.options | 2 +- mesh.proto | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mesh.options b/mesh.options index d5dfe80..063b18e 100644 --- a/mesh.options +++ b/mesh.options @@ -15,7 +15,7 @@ # FIXME, max out based on total SubPacket size And do fragmentation and reassembly (for larger payloads) at the Android layer, not the esp32 layer. # note: this payload length is ONLY the bytes that are sent inside of the radiohead packet -*Data.payload max_size:251 +*Data.payload max_size:240 # 256 bit or 128 bit psk key *ChannelSettings.psk max_size:32 diff --git a/mesh.proto b/mesh.proto index 3461c21..0ade4f8 100644 --- a/mesh.proto +++ b/mesh.proto @@ -266,13 +266,15 @@ message MeshPacket { Note: Our crypto implementation uses this field as well. See docs/software/crypto.md for details. */ - uint32 from = 1; + uint32 from = 1; // FIXME - really should be fixed32 instead, this encoding + // only hurts the ble link though. /** The (immediate) destination for this packet. If we are using routing, the final destination will be in payload.dest */ - uint32 to = 2; + uint32 to = 2; // FIXME - really should be fixed32 instead, this encoding only + // hurts the ble link though. /** Internally to the mesh radios we will route SubPackets encrypted per @@ -304,7 +306,8 @@ message MeshPacket { Note: Our crypto implementation uses this id as well. See docs/software/crypto.md for details. */ - uint32 id = 6; + uint32 id = 6; // FIXME - really should be fixed32 instead, this encoding only + // hurts the ble link though. /// The time this message was received by the esp32 (secs since 1970). Note: /// this field is _never_ sent on the radio link itself (to save space) Times