Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Required additions for NextHopRouter #624

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Required additions for NextHopRouter #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
739a6d4
Add `next_hop` and `relay_node` to MeshPacket
GUVWAF Nov 18, 2024
40497bf
Add `next_hop` to NodeInfoLite
GUVWAF Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion meshtastic/deviceonly.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@

*NodeInfoLite.channel int_size:8
*NodeInfoLite.hops_away int_size:8
*NodeInfoLite.next_hop int_size:8

*UserLite.long_name max_size:40
*UserLite.short_name max_size:5
*UserLite.public_key max_size:32 # public key
*UserLite.macaddr max_size:6 fixed_length:true
*UserLite.macaddr max_size:6 fixed_length:true
7 changes: 6 additions & 1 deletion meshtastic/deviceonly.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ message NodeInfoLite {
* Persists between NodeDB internal clean ups
*/
bool is_ignored = 11;

/*
* Last byte of the node number of the node that should be used as the next hop to reach this node.
*/
uint32 next_hop = 12;
}

/*
Expand Down Expand Up @@ -237,4 +242,4 @@ message ChannelFile {
* NodeDB.cpp in the device code.
*/
uint32 version = 2;
}
}
4 changes: 3 additions & 1 deletion meshtastic/mesh.options
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
*MeshPacket.hop_limit int_size:8
*MeshPacket.hop_start int_size:8
*MeshPacket.channel int_size:8
*MeshPacket.next_hop int_size:8
*MeshPacket.relay_node int_size:8

*QueueStatus.res int_size:8
*QueueStatus.free int_size:8
Expand Down Expand Up @@ -75,4 +77,4 @@

*ChunkedPayload.chunk_count int_size:16
*ChunkedPayload.chunk_index int_size:16
*ChunkedPayload.payload_chunk max_size:228
*ChunkedPayload.payload_chunk max_size:228
14 changes: 13 additions & 1 deletion meshtastic/mesh.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,6 +1233,18 @@ message MeshPacket {
* Indicates whether the packet was en/decrypted using PKI
*/
bool pki_encrypted = 17;

/*
* Last byte of the node number of the node that should be used as the next hop in routing.
* Set by the firmware internally, clients are not supposed to set this.
*/
uint32 next_hop = 18;

/*
* Last byte of the node number of the node that will relay/relayed this packet.
* Set by the firmware internally, clients are not supposed to set this.
*/
uint32 relay_node = 19;
}

/*
Expand Down Expand Up @@ -2040,4 +2052,4 @@ message ChunkedPayloadResponse {
*/
resend_chunks resend_chunks = 4;
}
}
}