go/ham
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meshcore: support for multibyte path hashes
Some checks failed
Run tests / test (1.25) (push) Failing after 1m33s
Details
Run tests / test (stable) (push) Failing after 1m41s
Details

Browse Source
This commit is contained in:
maze
2026-03-06 09:16:58 +01:00
parent 8f8a97300f
commit e6bda98b92
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
protocol/meshcore/packet.go
View File

@@ -38,7 +38,14 @@ type Packet struct {
// TransportCodes are set by transport route types. // TransportCodes are set by transport route types.
TransportCodes []uint16 `json:"transport_codes,omitempty"` TransportCodes []uint16 `json:"transport_codes,omitempty"`
// Path are repeater hashes. // PathHashSize is the number of bytes per node in the path hash.
PathHashSize int `json:"path_hash_size"`
// PathHashCount is the number of nodes in the path hash.
PathHashCount int `json:"path_hash_count"`
// Path are repeater hashes. The first hash is the source node, the last hash is the destination node, and the middle hashes are repeaters.
// The path is empty for direct packets.
Path []byte `json:"path"` Path []byte `json:"path"`
// Payload is the raw (encoded) payload. // Payload is the raw (encoded) payload.
@@ -158,14 +165,21 @@ func (packet *Packet) UnmarshalBytes(data []byte) error {
packet.TransportCodes = nil packet.TransportCodes = nil
} }
pathLength := int(data[offset]) var (
pathLength = int(data[offset])
pathHashSize = pathLength>>6 + 1
pathHashCount = pathLength & 63
pathByteLength = pathHashSize * pathHashCount
)
offset += 1 offset += 1
if pathLength > maxPathSize { if pathByteLength > maxPathSize {
return fmt.Errorf("meshcore: path length %d exceeds maximum of %d", pathLength, maxPathSize) return fmt.Errorf("meshcore: path length %d exceeds maximum of %d", pathByteLength, maxPathSize)
} else if pathLength > len(data[offset:]) { } else if pathByteLength > len(data[offset:]) {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
packet.Path = make([]byte, pathLength) packet.Path = make([]byte, pathByteLength)
packet.PathHashSize = pathHashSize
packet.PathHashCount = pathHashCount
offset += copy(packet.Path, data[offset:]) offset += copy(packet.Path, data[offset:])
payloadLength := len(data[offset:]) payloadLength := len(data[offset:])