2 files changed, 27 insertions, 3 deletions
diff --git a/dhcpv6/server6/server.go b/dhcpv6/server6/server.go
index e4fcf91..ab9cb32 100644
--- a/dhcpv6/server6/server.go
+++ b/dhcpv6/server6/server.go
@@ -58,6 +58,7 @@ import (
 	"net"
 
 	"github.com/insomniacslk/dhcp/dhcpv6"
+	"golang.org/x/net/ipv6"
 )
 
 // Handler is a type that defines the handler function to be called every time a
@@ -111,8 +112,12 @@ func WithConn(conn net.PacketConn) ServerOpt {
 	}
 }
 
-// NewServer initializes and returns a new Server object
-func NewServer(addr *net.UDPAddr, handler Handler, opt ...ServerOpt) (*Server, error) {
+// NewServer initializes and returns a new Server object, listening on `addr`,
+// and joining the multicast group ff02::1:2 . If `addr` is nil, IPv6 unspec is
+// used. If `WithConn` is used with a non-nil address, `addr` and `ifname` have
+// no effect. In such case, joining the multicast group is the caller's
+// responsibility.
+func NewServer(ifname string, addr *net.UDPAddr, handler Handler, opt ...ServerOpt) (*Server, error) {
 	s := &Server{
 		handler: handler,
 	}
@@ -122,10 +127,29 @@ func NewServer(addr *net.UDPAddr, handler Handler, opt ...ServerOpt) (*Server, e
 	}
 
 	if s.conn == nil {
+		// no connection provided by the user, create a new one
 		conn, err := net.ListenUDP("udp6", addr)
 		if err != nil {
 			return nil, err
 		}
+		// join multicast group on the specified interface
+		var iface *net.Interface
+		if ifname == "" {
+			iface = nil
+		} else {
+			iface, err = net.InterfaceByName(ifname)
+			if err != nil {
+				return nil, err
+			}
+		}
+		group := net.UDPAddr{
+			IP:   dhcpv6.AllDHCPRelayAgentsAndServers,
+			Port: dhcpv6.DefaultServerPort,
+		}
+		p := ipv6.NewPacketConn(conn)
+		if err := p.JoinGroup(iface, &group); err != nil {
+			return nil, err
+		}
 		s.conn = conn
 	}
 	return s, nil
diff --git a/dhcpv6/server6/server_test.go b/dhcpv6/server6/server_test.go
index 3b204f1..c81525a 100644
--- a/dhcpv6/server6/server_test.go
+++ b/dhcpv6/server6/server_test.go
@@ -33,7 +33,7 @@ func setUpClientAndServer(handler Handler) (*nclient6.Client, *Server) {
 		IP:   net.ParseIP("::1"),
 		Port: 0,
 	}
-	s, err := NewServer(laddr, handler)
+	s, err := NewServer("lo", laddr, handler)
 	if err != nil {
 		panic(err)
 	}