Adds an option to change the listen-on address and exposes the UDP connection

controller.go

@@ -11,7 +11,7 @@ import (
 	"github.com/jsimonetti/go-artnet/packet/code"
 )
 
-var broadcastAddr = net.UDPAddr{
+var defaultBroadcastAddr = net.UDPAddr{
 	IP:   []byte{0x02, 0xff, 0xff, 0xff},
 	Port: int(packet.ArtNetPort),
 }
@@ -89,6 +89,8 @@ type Controller struct {
 	InputAddress  map[Address]*ControlledNode
 	nodeLock      sync.Mutex
 
+	broadcastAddr net.UDPAddr
+
 	shutdownCh chan struct{}
 
 	maxFPS int
@@ -101,9 +103,10 @@ type Controller struct {
 // NewController return a Controller
 func NewController(name string, ip net.IP, log Logger, opts ...Option) *Controller {
 	c := &Controller{
-		cNode:  NewNode(name, code.StController, ip, log),
-		log:    log,
-		maxFPS: 1000,
+		cNode:         NewNode(name, code.StController, ip, log),
+		log:           log,
+		maxFPS:        1000,
+		broadcastAddr: defaultBroadcastAddr,
 	}
 
 	for _, opt := range opts {
@@ -161,7 +164,7 @@ func (c *Controller) pollLoop() {
 
 	// send ArtPollPacket
 	c.cNode.sendCh <- netPayload{
-		address: broadcastAddr,
+		address: c.broadcastAddr,
 		data:    b,
 	}
 	c.cNode.pollCh <- packet.ArtPollPacket{}
@@ -172,7 +175,7 @@ func (c *Controller) pollLoop() {
 		case <-c.pollTicker.C:
 			// send ArtPollPacket
 			c.cNode.sendCh <- netPayload{
-				address: broadcastAddr,
+				address: c.broadcastAddr,
 				data:    b,
 			}
 			c.cNode.pollCh <- packet.ArtPollPacket{}

node.go

@@ -19,11 +19,14 @@ type Node struct {
 	// Config holds the configuration of this node
 	Config NodeConfig
 
+	broadcastAddr net.UDPAddr
+
 	// conn is the UDP connection this node will listen on
-	conn      *net.UDPConn
-	localAddr net.UDPAddr
-	sendCh    chan netPayload
-	recvCh    chan netPayload
+	conn       *net.UDPConn
+	localAddr  net.UDPAddr
+	listenAddr net.UDPAddr
+	sendCh     chan netPayload
+	recvCh     chan netPayload
 
 	// shutdownCh will be closed on shutdown of the node
 	shutdownCh   chan struct{}
@@ -49,15 +52,25 @@ type netPayload struct {
 }
 
 // NewNode return a Node
-func NewNode(name string, style code.StyleCode, ip net.IP, log Logger) *Node {
+func NewNode(name string, style code.StyleCode, ip net.IP, log Logger, opts ...NodeOption) *Node {
 	n := &Node{
 		Config: NodeConfig{
 			Name: name,
 			Type: style,
 		},
-		conn:     nil,
-		shutdown: true,
-		log:      log.With(Fields{"type": "Node"}),
+		listenAddr:    net.UDPAddr{Port: packet.ArtNetPort},
+		broadcastAddr: defaultBroadcastAddr,
+		conn:          nil,
+		shutdown:      true,
+		log:           log.With(Fields{"type": "Node"}),
+	}
+
+	for _, opt := range opts {
+		n.SetOption(opt)
+	}
+
+	for _, opt := range opts {
+		n.SetOption(opt)
 	}
 
 	// initialize required node callbacks
@@ -80,6 +93,10 @@ func NewNode(name string, style code.StyleCode, ip net.IP, log Logger) *Node {
 	return n
 }
 
+func (n *Node) Connection() *net.UDPConn {
+	return n.conn
+}
+
 // Stop will stop all running routines and close the network connection
 func (n *Node) Stop() {
 	n.shutdownLock.Lock()
@@ -110,7 +127,7 @@ func (n *Node) Start() error {
 	n.shutdownCh = make(chan struct{})
 	n.shutdown = false
 
-	c, err := net.ListenPacket("udp4", fmt.Sprintf(":%d", packet.ArtNetPort))
+	c, err := net.ListenPacket("udp4", n.listenAddr.String())
 	if err != nil {
 		n.shutdownErr = fmt.Errorf("error net.ListenPacket: %s", err)
 		n.log.With(Fields{"error": err}).Error("error net.ListenPacket")
@@ -150,7 +167,7 @@ func (n *Node) pollReplyLoop() {
 			n.log.With(nil).Debug("sending ArtPollReply")
 
 			n.sendCh <- netPayload{
-				address: broadcastAddr,
+				address: n.broadcastAddr,
 				data:    me,
 			}
 

options.go

@@ -1,5 +1,11 @@
 package artnet
 
+import (
+	"net"
+
+	"github.com/jsimonetti/go-artnet/packet"
+)
+
 // Option is a functional option handler for Controller.
 type Option func(*Controller) error
 
@@ -15,3 +21,57 @@ func MaxFPS(fps int) Option {
 		return nil
 	}
 }
+
+// BroadcastAddr sets the broadcast address to use; defaults to 2.255.255.255:6454
+func BroadcastAddr(addr net.UDPAddr) Option {
+	return func(c *Controller) error {
+		c.broadcastAddr = addr
+		return nil
+	}
+}
+
+// ListenAddr sets the listen address and port to use; defaults to :6454 if unset
+func ListenAddress(addr net.UDPAddr) Option {
+	return func(c *Controller) error {
+		return NodeListenAddress(addr)(c.cNode)
+	}
+}
+
+// ListenIP sets the listen IP to use; defaults to :6454 if unset
+func ListenIP(ip net.IP) Option {
+	return func(c *Controller) error {
+		return NodeListenIP(ip)(c.cNode)
+	}
+}
+
+// NodeOption is a functional option handler for Node.
+type NodeOption func(*Node) error
+
+// SetOption runs a functional option against Node.
+func (n *Node) SetOption(option NodeOption) error {
+	return option(n)
+}
+
+// NodeBroadcastAddress sets the broadcast address to use; defaults to 2.255.255.255:6454
+func NodeBroadcastAddress(addr net.UDPAddr) NodeOption {
+	return func(n *Node) error {
+		n.broadcastAddr = addr
+		return nil
+	}
+}
+
+// NodeListenAddress sets the listen address and port to use; defaults to :6454 if unset
+func NodeListenAddress(addr net.UDPAddr) NodeOption {
+	return func(n *Node) error {
+		n.listenAddr = addr
+		return nil
+	}
+}
+
+// NodeListenIP sets the listen IP to use; defaults to :6454 if unset
+func NodeListenIP(ip net.IP) NodeOption {
+	return func(n *Node) error {
+		n.listenAddr = net.UDPAddr{IP: ip, Port: packet.ArtNetPort}
+		return nil
+	}
+}