Merge pull request #456 from meshtastic/nodeinfo-routing-fields

Add via_mqtt and hops_away to NodeInfo/Lite
meshtastic · Mar 2, 2024 · 62b7d8b · 62b7d8b
2 parents 1e85de9 + 7ebbc39
commit 62b7d8b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/meshtastic/deviceonly.options b/meshtastic/deviceonly.options
@@ -15,4 +15,5 @@
 
 *DeviceState.node_remote_hardware_pins max_count:12
 
-*NodeInfoLite.channel int_size:8
+*NodeInfoLite.channel int_size:8
+*NodeInfoLite.hops_away int_size:8
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
@@ -116,6 +116,16 @@ message NodeInfoLite {
    * local channel index we heard that node on. Only populated if its not the default channel.
    */
   uint32 channel = 7;
+
+  /*
+   * True if we witnessed the node over MQTT instead of LoRA transport
+   */
+  bool via_mqtt = 8;
+
+  /*
+   * Number of hops away from us this node is (0 if adjacent)
+   */
+  uint32 hops_away = 9;
 }
 
 /*

diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
@@ -14,6 +14,7 @@
 *Data.payload max_size:237
 
 *NodeInfo.channel int_size:8
+*NodeInfo.hops_away int_size:8
 
 # Big enough for 1.2.28.568032c-d
 *MyNodeInfo.firmware_version max_size:18

diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
@@ -1116,6 +1116,16 @@ message NodeInfo {
    * local channel index we heard that node on. Only populated if its not the default channel.
    */
   uint32 channel = 7;
+
+  /*
+   * True if we witnessed the node over MQTT instead of LoRA transport
+   */
+  bool via_mqtt = 8;
+
+  /*
+   * Number of hops away from us this node is (0 if adjacent)
+   */
+  uint32 hops_away = 9;
 }
 
 /*