Networks/Reticulum-Go
2
1
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects 1 Releases 1 Wiki Activity

Fix hash calculation in Destination to use TruncatedHash and improve logging for interface announcements

Browse Source
This commit is contained in:
ivan
2025-09-07 02:23:30 -05:00
parent 2ffd12b3e1
commit 38323da57d
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/destination/destination.go
View File

@@ -1,7 +1,6 @@
package destination package destination
import ( import (
"crypto/sha256"
"errors" "errors"
"fmt" "fmt"
"log" "log"
@@ -117,19 +116,20 @@ func New(id *identity.Identity, direction byte, destType byte, appName string, t
func (d *Destination) calculateHash() []byte { func (d *Destination) calculateHash() []byte {
debugLog(DEBUG_TRACE, "Calculating hash for destination %s", d.ExpandName()) debugLog(DEBUG_TRACE, "Calculating hash for destination %s", d.ExpandName())
nameHash := sha256.Sum256([]byte(d.ExpandName())) // hash identity first, then concatenate with name hash and truncate
identityHash := sha256.Sum256(d.identity.GetPublicKey()) identityHash := identity.TruncatedHash(d.identity.GetPublicKey())
nameHash := identity.TruncatedHash([]byte(d.ExpandName()))
debugLog(DEBUG_ALL, "Name hash: %x", nameHash)
debugLog(DEBUG_ALL, "Identity hash: %x", identityHash) debugLog(DEBUG_ALL, "Identity hash: %x", identityHash)
debugLog(DEBUG_ALL, "Name hash: %x", nameHash)
combined := append(nameHash[:], identityHash[:]...) // Concatenate identity hash + name hash
finalHash := sha256.Sum256(combined) combined := append(identityHash, nameHash...)
finalHash := identity.TruncatedHash(combined)
truncated := finalHash[:16] debugLog(DEBUG_VERBOSE, "Calculated destination hash: %x", finalHash)
debugLog(DEBUG_VERBOSE, "Calculated destination hash: %x", truncated)
return truncated return finalHash
} }
func (d *Destination) ExpandName() string { func (d *Destination) ExpandName() string {
@@ -169,13 +169,21 @@ func (d *Destination) Announce(appData []byte) error {
} }
interfaces := d.transport.GetInterfaces() interfaces := d.transport.GetInterfaces()
log.Printf("[DEBUG-7] Got %d interfaces from transport", len(interfaces))
var lastErr error var lastErr error
for _, iface := range interfaces { for name, iface := range interfaces {
log.Printf("[DEBUG-7] Checking interface %s: enabled=%v, online=%v", name, iface.IsEnabled(), iface.IsOnline())
if iface.IsEnabled() && iface.IsOnline() { if iface.IsEnabled() && iface.IsOnline() {
log.Printf("[DEBUG-7] Sending announce to interface %s (%d bytes)", name, len(packet))
if err := iface.Send(packet, ""); err != nil { if err := iface.Send(packet, ""); err != nil {
log.Printf("[ERROR] Failed to send announce on interface %s: %v", iface.GetName(), err) log.Printf("[ERROR] Failed to send announce on interface %s: %v", name, err)
lastErr = err lastErr = err
} else {
log.Printf("[DEBUG-7] Successfully sent announce to interface %s", name)
} }
} else {
log.Printf("[DEBUG-7] Skipping interface %s (not enabled or not online)", name)
} }
} }