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

Fixes

Browse Source
This commit is contained in:
ivan
2025-10-30 19:05:20 -05:00
parent f599cc4d43
commit a45ad400f9
2 changed files with 18 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
pkg/interfaces/auto.go
View File

@@ -31,10 +31,10 @@ type AutoInterface struct {
peers map[string]*Peer
linkLocalAddrs []string
adoptedInterfaces map[string]string
interfaceServers map[string]net.PacketConn
interfaceServers map[string]net.Conn
multicastEchoes map[string]time.Time
mutex sync.RWMutex
outboundConn net.PacketConn
outboundConn net.Conn
}
type Peer struct {
@@ -63,7 +63,7 @@ func NewAutoInterface(name string, config *common.InterfaceConfig) (*AutoInterfa
peers: make(map[string]*Peer),
linkLocalAddrs: make([]string, 0),
adoptedInterfaces: make(map[string]string),
interfaceServers: make(map[string]*net.UDPConn),
interfaceServers: make(map[string]net.Conn),
multicastEchoes: make(map[string]time.Time),
}
@@ -97,45 +97,26 @@ func (ai *AutoInterface) startDiscoveryListener(iface *net.Interface) error {
}
func (ai *AutoInterface) startDataListener(iface *net.Interface) error {
addr := &net.UDPAddr{
IP: net.IPv6zero,
Port: ai.dataPort,
Zone: iface.Name,
}
conn, err := net.ListenPacket("udp6", addr.String())
if err != nil {
return err
}
ai.interfaceServers[iface.Name] = conn
go ai.handleData(conn)
return nil
// TinyGo doesn't support UDP servers
return fmt.Errorf("startDataListener not supported in TinyGo")
}
func (ai *AutoInterface) handleDiscovery(conn net.PacketConn, ifaceName string) {
func (ai *AutoInterface) handleDiscovery(conn net.Conn, ifaceName string) {
// Not used in TinyGo
buf := make([]byte, 1024)
for {
_, addr, err := conn.ReadFrom(buf)
_, err := conn.Read(buf)
if err != nil {
log.Printf("Discovery read error: %v", err)
continue
}
remoteAddr, ok := addr.(*net.UDPAddr)
if !ok {
log.Printf("Error: received non-UDP address in discovery")
continue
}
ai.handlePeerAnnounce(remoteAddr, ifaceName)
}
}
func (ai *AutoInterface) handleData(conn net.PacketConn) {
func (ai *AutoInterface) handleData(conn net.Conn) {
buf := make([]byte, ai.GetMTU())
for {
n, _, err := conn.ReadFrom(buf)
n, err := conn.Read(buf)
if err != nil {
if !ai.IsDetached() {
log.Printf("Data read error: %v", err)
@@ -191,31 +172,8 @@ func (ai *AutoInterface) peerJobs() {
}
func (ai *AutoInterface) Send(data []byte, address string) error {
ai.mutex.RLock()
defer ai.mutex.RUnlock()
for _, peer := range ai.peers {
addr := &net.UDPAddr{
IP: net.ParseIP(address),
Port: ai.dataPort,
Zone: peer.ifaceName,
}
if ai.outboundConn == nil {
var err error
ai.outboundConn, err = net.ListenPacket("udp6", ":0")
if err != nil {
return err
}
}
if _, err := ai.outboundConn.WriteTo(data, addr); err != nil {
log.Printf("Failed to send to peer %s: %v", address, err)
continue
}
}
return nil
// TinyGo doesn't support UDP outbound connections for auto-discovery
return fmt.Errorf("Send not supported in TinyGo - requires UDP client connections")
}
func (ai *AutoInterface) Stop() error {

37
pkg/interfaces/udp.go
View File

@@ -11,7 +11,7 @@ import (
type UDPInterface struct {
BaseInterface
conn net.PacketConn
conn net.Conn
addr *net.UDPAddr
targetAddr *net.UDPAddr
mutex sync.RWMutex
@@ -123,11 +123,7 @@ func (ui *UDPInterface) ProcessOutgoing(data []byte) error {
return fmt.Errorf("interface offline")
}
if ui.targetAddr == nil {
return fmt.Errorf("no target address configured")
}
_, err := ui.conn.WriteTo(data, ui.targetAddr)
_, err := ui.conn.Write(data)
if err != nil {
return fmt.Errorf("UDP write failed: %v", err)
}
@@ -176,23 +172,15 @@ func (ui *UDPInterface) Disable() {
}
func (ui *UDPInterface) Start() error {
conn, err := net.ListenPacket("udp", ui.addr.String())
if err != nil {
return err
}
ui.conn = conn
ui.Online = true
// Start the read loop in a goroutine
go ui.readLoop()
return nil
// TinyGo doesn't support UDP servers, only clients
return fmt.Errorf("UDPInterface not supported in TinyGo - UDP server functionality requires net.ListenUDP")
}
func (ui *UDPInterface) readLoop() {
// This method is not used in TinyGo since UDP servers are not supported
buffer := make([]byte, common.DEFAULT_MTU)
for ui.IsOnline() && !ui.IsDetached() {
n, addr, err := ui.conn.ReadFrom(buffer)
n, err := ui.conn.Read(buffer)
if err != nil {
if ui.IsOnline() {
log.Printf("Error reading from UDP interface %s: %v", ui.Name, err)
@@ -200,19 +188,6 @@ func (ui *UDPInterface) readLoop() {
return
}
remoteAddr, ok := addr.(*net.UDPAddr)
if !ok {
log.Printf("Error: received non-UDP address from UDP interface %s", ui.Name)
continue
}
ui.mutex.Lock()
if ui.targetAddr == nil {
log.Printf("[DEBUG-7] UDP interface %s discovered peer %s", ui.Name, remoteAddr)
ui.targetAddr = remoteAddr
}
ui.mutex.Unlock()
if ui.packetCallback != nil {
ui.packetCallback(buffer[:n], ui)
}