Refactor receiver to use multicast library for IGMP handling

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Ian Gulliver
2026-01-29 21:42:58 -08:00
parent d5ca321a4c
commit 989cfe2ae1

View File

@@ -4,47 +4,37 @@ import (
"net" "net"
"time" "time"
"golang.org/x/net/ipv4" "github.com/gopatchy/multicast"
) )
type Receiver struct { type Receiver struct {
conn *ipv4.PacketConn conn *multicast.Conn
rawConn net.PacketConn
handler func(src *net.UDPAddr, pkt interface{}) handler func(src *net.UDPAddr, pkt interface{})
done chan struct{} done chan struct{}
} }
func NewReceiver(ifaceName string) (*Receiver, error) { func NewUniverseReceiver(iface *net.Interface, universe uint16) (*Receiver, error) {
c, err := net.ListenPacket("udp4", ":5568") c, err := multicast.ListenMulticastUDP("udp4", iface, MulticastAddr(universe))
if err != nil { if err != nil {
return nil, err return nil, err
} }
p := ipv4.NewPacketConn(c)
if ifaceName != "" {
iface, err := net.InterfaceByName(ifaceName)
if err != nil {
c.Close()
return nil, err
}
p.SetMulticastInterface(iface)
}
return &Receiver{ return &Receiver{
conn: p, conn: c,
rawConn: c, done: make(chan struct{}),
done: make(chan struct{}),
}, nil }, nil
} }
func (r *Receiver) JoinUniverse(iface *net.Interface, universe uint16) error { func NewDiscoveryReceiver(iface *net.Interface) (*Receiver, error) {
group := net.IPv4(239, 255, byte(universe>>8), byte(universe&0xff)) c, err := multicast.ListenMulticastUDP("udp4", iface, DiscoveryAddr)
return r.conn.JoinGroup(iface, &net.UDPAddr{IP: group}) if err != nil {
} return nil, err
}
func (r *Receiver) JoinDiscovery(iface *net.Interface) error { return &Receiver{
return r.conn.JoinGroup(iface, DiscoveryAddr) conn: c,
done: make(chan struct{}),
}, nil
} }
func (r *Receiver) SetHandler(fn func(src *net.UDPAddr, pkt interface{})) { func (r *Receiver) SetHandler(fn func(src *net.UDPAddr, pkt interface{})) {
@@ -61,7 +51,7 @@ func (r *Receiver) Stop() {
default: default:
close(r.done) close(r.done)
} }
r.rawConn.Close() r.conn.Close()
} }
func (r *Receiver) receiveLoop() { func (r *Receiver) receiveLoop() {
@@ -74,7 +64,7 @@ func (r *Receiver) receiveLoop() {
default: default:
} }
r.rawConn.SetReadDeadline(time.Now().Add(1 * time.Second)) r.conn.RawConn().SetReadDeadline(time.Now().Add(1 * time.Second))
n, _, src, err := r.conn.ReadFrom(buf) n, _, src, err := r.conn.ReadFrom(buf)
if err != nil { if err != nil {
if netErr, ok := err.(net.Error); ok && netErr.Timeout() { if netErr, ok := err.(net.Error); ok && netErr.Timeout() {