diff --git a/dhcpd/v6.go b/dhcpd/v6.go index 0a1a7d47..4eba42c1 100644 --- a/dhcpd/v6.go +++ b/dhcpd/v6.go @@ -182,7 +182,7 @@ func (s *V6Server) checkSID(msg *dhcpv6.Message) error { return nil } -func (s *V6Server) process(msg *dhcpv6.Message, req dhcpv6.DHCPv6, resp dhcpv6.DHCPv6) { +func (s *V6Server) process(msg *dhcpv6.Message, req dhcpv6.DHCPv6, resp dhcpv6.DHCPv6) bool { switch msg.Type() { case dhcpv6.MessageTypeSolicit, dhcpv6.MessageTypeRequest, @@ -192,19 +192,19 @@ func (s *V6Server) process(msg *dhcpv6.Message, req dhcpv6.DHCPv6, resp dhcpv6.D // break default: - return + return false } mac, err := dhcpv6.ExtractMAC(req) if err != nil { log.Debug("DHCPv6: dhcpv6.ExtractMAC: %s", err) - return + return false } lease := s.findLease(mac) if lease == nil { log.Debug("DHCPv6: no lease for: %s", mac) - return + return false } switch msg.Type() { @@ -215,20 +215,20 @@ func (s *V6Server) process(msg *dhcpv6.Message, req dhcpv6.DHCPv6, resp dhcpv6.D oia := msg.Options.OneIANA() if oia == nil { log.Debug("DHCPv6: no IANA option in %s", msg.Type().String()) - return + return false } if !bytes.Equal(oia.IaId[:], []byte(valueIAID)) { log.Debug("DHCPv6: invalid IANA.ID value in %s", msg.Type().String()) - return + return false } oiaAddr := oia.Options.OneAddress() if oiaAddr == nil { log.Debug("DHCPv6: no IANA.Addr option in %s", msg.Type().String()) - return + return false } if !oiaAddr.IPv6Addr.Equal(lease.IP) { log.Debug("DHCPv6: invalid IANA.Addr option in %s", msg.Type().String()) - return + return false } } @@ -245,6 +245,7 @@ func (s *V6Server) process(msg *dhcpv6.Message, req dhcpv6.DHCPv6, resp dhcpv6.D if msg.IsOptionRequested(dhcpv6.OptionDNSRecursiveNameServer) { resp.UpdateOption(dhcpv6.OptDNS(s.conf.dnsIPAddrs...)) } + return true } // 1. @@ -310,7 +311,7 @@ func (s *V6Server) packetHandler(conn net.PacketConn, peer net.Addr, req dhcpv6. resp.AddOption(dhcpv6.OptServerID(s.conf.sid)) - s.process(msg, req, resp) + _ = s.process(msg, req, resp) log.Debug("DHCPv6: sending: %s", resp.Summary()) diff --git a/dhcpd/v6_test.go b/dhcpd/v6_test.go index 270e6ae9..60885a05 100644 --- a/dhcpd/v6_test.go +++ b/dhcpd/v6_test.go @@ -4,6 +4,8 @@ import ( "net" "testing" + "github.com/insomniacslk/dhcp/dhcpv6" + "github.com/insomniacslk/dhcp/iana" "github.com/stretchr/testify/assert" ) @@ -54,3 +56,53 @@ func TestV6StaticLease(t *testing.T) { s.Stop() } + +func TestV6GetLease(t *testing.T) { + conf := V6ServerConf{ + Enabled: true, + RangeStart: "2001::1", + notify: notify, + } + s, err := v6Create(conf) + assert.True(t, err == nil) + s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")} + s.conf.sid = dhcpv6.Duid{ + Type: dhcpv6.DUID_LLT, + HwType: iana.HWTypeEthernet, + } + s.conf.sid.LinkLayerAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa") + + l := Lease{} + l.IP = net.ParseIP("2001::1") + l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa") + assert.True(t, s.AddStaticLease(l) == nil) + + // "Solicit" + mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa") + req, _ := dhcpv6.NewSolicit(mac) + msg, _ := req.GetInnerMessage() + resp, _ := dhcpv6.NewAdvertiseFromSolicit(msg) + assert.True(t, s.process(msg, req, resp)) + resp.AddOption(dhcpv6.OptServerID(s.conf.sid)) + + // check "Advertise" + oia := resp.Options.OneIANA() + oiaAddr := oia.Options.OneAddress() + assert.Equal(t, "2001::1", oiaAddr.IPv6Addr.String()) + + // "Request" + req, _ = dhcpv6.NewRequestFromAdvertise(resp) + msg, _ = req.GetInnerMessage() + resp, _ = dhcpv6.NewReplyFromMessage(msg) + assert.True(t, s.process(msg, req, resp)) + + // check "Reply" + oia = resp.Options.OneIANA() + oiaAddr = oia.Options.OneAddress() + assert.Equal(t, "2001::1", oiaAddr.IPv6Addr.String()) + dnsAddrs := resp.Options.DNS() + assert.Equal(t, 1, len(dnsAddrs)) + assert.Equal(t, "2000::1", dnsAddrs[0].String()) + + s.Stop() +}