Update deps

vendor/github.com/miekg/dns/.travis.yml

@@ -4,6 +4,7 @@ sudo: false
 go:
   - 1.10.x
   - 1.11.x
+  - 1.12.x
   - tip
 
 before_install:

vendor/github.com/miekg/dns/README.md

@@ -68,6 +68,7 @@ A not-so-up-to-date-list-that-may-be-actually-current:
 * https://blitiri.com.ar/p/dnss ([github mirror](https://github.com/albertito/dnss))
 * https://github.com/semihalev/sdns
 * https://render.com
+* https://github.com/peterzen/goresolver
 
 Send pull request if you want to be listed here.
 

vendor/github.com/miekg/dns/client.go

@@ -3,7 +3,6 @@ package dns
 // A client implementation.
 
 import (
-	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/binary"
@@ -220,18 +219,15 @@ func (co *Conn) ReadMsgHeader(hdr *Header) ([]byte, error) {
 		n   int
 		err error
 	)
-
-	switch t := co.Conn.(type) {
+	switch co.Conn.(type) {
 	case *net.TCPConn, *tls.Conn:
-		r := t.(io.Reader)
-
-		// First two bytes specify the length of the entire message.
-		l, err := tcpMsgLen(r)
-		if err != nil {
+		var length uint16
+		if err := binary.Read(co.Conn, binary.BigEndian, &length); err != nil {
 			return nil, err
 		}
-		p = make([]byte, l)
-		n, err = tcpRead(r, p)
+
+		p = make([]byte, length)
+		n, err = io.ReadFull(co.Conn, p)
 	default:
 		if co.UDPSize > MinMsgSize {
 			p = make([]byte, co.UDPSize)
@@ -258,72 +254,26 @@ func (co *Conn) ReadMsgHeader(hdr *Header) ([]byte, error) {
 	return p, err
 }
 
-// tcpMsgLen is a helper func to read first two bytes of stream as uint16 packet length.
-func tcpMsgLen(t io.Reader) (int, error) {
-	p := []byte{0, 0}
-	n, err := t.Read(p)
-	if err != nil {
-		return 0, err
-	}
-
-	// As seen with my local router/switch, returns 1 byte on the above read,
-	// resulting a a ShortRead. Just write it out (instead of loop) and read the
-	// other byte.
-	if n == 1 {
-		n1, err := t.Read(p[1:])
-		if err != nil {
-			return 0, err
-		}
-		n += n1
-	}
-
-	if n != 2 {
-		return 0, ErrShortRead
-	}
-	l := binary.BigEndian.Uint16(p)
-	if l == 0 {
-		return 0, ErrShortRead
-	}
-	return int(l), nil
-}
-
-// tcpRead calls TCPConn.Read enough times to fill allocated buffer.
-func tcpRead(t io.Reader, p []byte) (int, error) {
-	n, err := t.Read(p)
-	if err != nil {
-		return n, err
-	}
-	for n < len(p) {
-		j, err := t.Read(p[n:])
-		if err != nil {
-			return n, err
-		}
-		n += j
-	}
-	return n, err
-}
-
 // Read implements the net.Conn read method.
 func (co *Conn) Read(p []byte) (n int, err error) {
 	if co.Conn == nil {
 		return 0, ErrConnEmpty
 	}
-	if len(p) < 2 {
-		return 0, io.ErrShortBuffer
-	}
-	switch t := co.Conn.(type) {
-	case *net.TCPConn, *tls.Conn:
-		r := t.(io.Reader)
 
-		l, err := tcpMsgLen(r)
-		if err != nil {
+	switch co.Conn.(type) {
+	case *net.TCPConn, *tls.Conn:
+		var length uint16
+		if err := binary.Read(co.Conn, binary.BigEndian, &length); err != nil {
 			return 0, err
 		}
-		if l > len(p) {
-			return l, io.ErrShortBuffer
+		if int(length) > len(p) {
+			return 0, io.ErrShortBuffer
 		}
-		return tcpRead(r, p[:l])
+
+		n, err := io.ReadFull(co.Conn, p[:length])
+		return int(n), err
 	}
+
 	// UDP connection
 	return co.Conn.Read(p)
 }
@@ -353,23 +303,19 @@ func (co *Conn) WriteMsg(m *Msg) (err error) {
 
 // Write implements the net.Conn Write method.
 func (co *Conn) Write(p []byte) (n int, err error) {
-	switch t := co.Conn.(type) {
+	switch co.Conn.(type) {
 	case *net.TCPConn, *tls.Conn:
-		w := t.(io.Writer)
-
-		lp := len(p)
-		if lp < 2 {
-			return 0, io.ErrShortBuffer
-		}
-		if lp > MaxMsgSize {
+		if len(p) > MaxMsgSize {
 			return 0, &Error{err: "message too large"}
 		}
-		l := make([]byte, 2, lp+2)
-		binary.BigEndian.PutUint16(l, uint16(lp))
-		p = append(l, p...)
-		n, err := io.Copy(w, bytes.NewReader(p))
+
+		l := make([]byte, 2)
+		binary.BigEndian.PutUint16(l, uint16(len(p)))
+
+		n, err := (&net.Buffers{l, p}).WriteTo(co.Conn)
 		return int(n), err
 	}
+
 	return co.Conn.Write(p)
 }
 
@@ -413,7 +359,7 @@ func ExchangeContext(ctx context.Context, m *Msg, a string) (r *Msg, err error)
 
 // ExchangeConn performs a synchronous query. It sends the message m via the connection
 // c and waits for a reply. The connection c is not closed by ExchangeConn.
-// This function is going away, but can easily be mimicked:
+// Deprecated: This function is going away, but can easily be mimicked:
 //
 //	co := &dns.Conn{Conn: c} // c is your net.Conn
 //	co.WriteMsg(m)

vendor/github.com/miekg/dns/dnssec_keyscan.go

@@ -322,6 +322,11 @@ func (kl *klexer) Next() (lex, bool) {
 				commt = false
 			}
 
+			if kl.key && str.Len() == 0 {
+				// ignore empty lines
+				break
+			}
+
 			kl.key = true
 
 			l.value = zValue

vendor/github.com/miekg/dns/duplicate.go

@@ -27,12 +27,12 @@ func (r1 *RR_Header) isDuplicate(_r2 RR) bool {
 	if r1.Rrtype != r2.Rrtype {
 		return false
 	}
-	if !isDulicateName(r1.Name, r2.Name) {
+	if !isDuplicateName(r1.Name, r2.Name) {
 		return false
 	}
 	// ignore TTL
 	return true
 }
 
-// isDulicateName checks if the domain names s1 and s2 are equal.
-func isDulicateName(s1, s2 string) bool { return equal(s1, s2) }
+// isDuplicateName checks if the domain names s1 and s2 are equal.
+func isDuplicateName(s1, s2 string) bool { return equal(s1, s2) }

vendor/github.com/miekg/dns/duplicate_generate.go

@@ -92,7 +92,7 @@ func main() {
 
 				if st.Tag(i) == `dns:"cdomain-name"` || st.Tag(i) == `dns:"domain-name"` {
 					o3(`for i := 0; i < len(r1.%s); i++ {
-						if !isDulicateName(r1.%s[i], r2.%s[i]) {
+						if !isDuplicateName(r1.%s[i], r2.%s[i]) {
 							return false
 						}
 					}`)
@@ -115,7 +115,7 @@ func main() {
 			case `dns:"a"`, `dns:"aaaa"`:
 				o2("if !r1.%s.Equal(r2.%s) {\nreturn false\n}")
 			case `dns:"cdomain-name"`, `dns:"domain-name"`:
-				o2("if !isDulicateName(r1.%s, r2.%s) {\nreturn false\n}")
+				o2("if !isDuplicateName(r1.%s, r2.%s) {\nreturn false\n}")
 			default:
 				o2("if r1.%s != r2.%s {\nreturn false\n}")
 			}

vendor/github.com/miekg/dns/scan_rr.go

@@ -133,7 +133,12 @@ func (rr *A) parse(c *zlexer, o, f string) *ParseError {
 	}
 
 	rr.A = net.ParseIP(l.token)
-	if rr.A == nil || l.err {
+	// IPv4 addresses cannot include ":".
+	// We do this rather than use net.IP's To4() because
+	// To4() treats IPv4-mapped IPv6 addresses as being
+	// IPv4.
+	isIPv4 := !strings.Contains(l.token, ":")
+	if rr.A == nil || !isIPv4 || l.err {
 		return &ParseError{f, "bad A A", l}
 	}
 	return slurpRemainder(c, f)
@@ -146,7 +151,10 @@ func (rr *AAAA) parse(c *zlexer, o, f string) *ParseError {
 	}
 
 	rr.AAAA = net.ParseIP(l.token)
-	if rr.AAAA == nil || l.err {
+	// IPv6 addresses must include ":", and IPv4
+	// addresses cannot include ":".
+	isIPv6 := strings.Contains(l.token, ":")
+	if rr.AAAA == nil || !isIPv6 || l.err {
 		return &ParseError{f, "bad AAAA AAAA", l}
 	}
 	return slurpRemainder(c, f)

vendor/github.com/miekg/dns/server.go

@@ -3,7 +3,6 @@
 package dns
 
 import (
-	"bytes"
 	"context"
 	"crypto/tls"
 	"encoding/binary"
@@ -12,26 +11,12 @@ import (
 	"net"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"time"
 )
 
 // Default maximum number of TCP queries before we close the socket.
 const maxTCPQueries = 128
 
-// The maximum number of idle workers.
-//
-// This controls the maximum number of workers that are allowed to stay
-// idle waiting for incoming requests before being torn down.
-//
-// If this limit is reached, the server will just keep spawning new
-// workers (goroutines) for each incoming request. In this case, each
-// worker will only be used for a single request.
-const maxIdleWorkersCount = 10000
-
-// The maximum length of time a worker may idle for before being destroyed.
-const idleWorkerTimeout = 10 * time.Second
-
 // aLongTimeAgo is a non-zero time, far in the past, used for
 // immediate cancelation of network operations.
 var aLongTimeAgo = time.Unix(1, 0)
@@ -81,7 +66,6 @@ type ConnectionStater interface {
 }
 
 type response struct {
-	msg            []byte
 	closed         bool // connection has been closed
 	hijacked       bool // connection has been hijacked by handler
 	tsigTimersOnly bool
@@ -92,7 +76,6 @@ type response struct {
 	tcp            net.Conn          // i/o connection if TCP was used
 	udpSession     *SessionUDP       // oob data to get egress interface right
 	writer         Writer            // writer to output the raw DNS bits
-	wg             *sync.WaitGroup   // for gracefull shutdown
 }
 
 // HandleFailed returns a HandlerFunc that returns SERVFAIL for every request it gets.
@@ -218,11 +201,6 @@ type Server struct {
 	// By default DefaultMsgAcceptFunc will be used.
 	MsgAcceptFunc MsgAcceptFunc
 
-	// UDP packet or TCP connection queue
-	queue chan *response
-	// Workers count
-	workersCount int32
-
 	// Shutdown handling
 	lock     sync.RWMutex
 	started  bool
@@ -240,51 +218,6 @@ func (srv *Server) isStarted() bool {
 	return started
 }
 
-func (srv *Server) worker(w *response) {
-	srv.serve(w)
-
-	for {
-		count := atomic.LoadInt32(&srv.workersCount)
-		if count > maxIdleWorkersCount {
-			return
-		}
-		if atomic.CompareAndSwapInt32(&srv.workersCount, count, count+1) {
-			break
-		}
-	}
-
-	defer atomic.AddInt32(&srv.workersCount, -1)
-
-	inUse := false
-	timeout := time.NewTimer(idleWorkerTimeout)
-	defer timeout.Stop()
-LOOP:
-	for {
-		select {
-		case w, ok := <-srv.queue:
-			if !ok {
-				break LOOP
-			}
-			inUse = true
-			srv.serve(w)
-		case <-timeout.C:
-			if !inUse {
-				break LOOP
-			}
-			inUse = false
-			timeout.Reset(idleWorkerTimeout)
-		}
-	}
-}
-
-func (srv *Server) spawnWorker(w *response) {
-	select {
-	case srv.queue <- w:
-	default:
-		go srv.worker(w)
-	}
-}
-
 func makeUDPBuffer(size int) func() interface{} {
 	return func() interface{} {
 		return make([]byte, size)
@@ -292,8 +225,6 @@ func makeUDPBuffer(size int) func() interface{} {
 }
 
 func (srv *Server) init() {
-	srv.queue = make(chan *response)
-
 	srv.shutdown = make(chan struct{})
 	srv.conns = make(map[net.Conn]struct{})
 
@@ -301,7 +232,10 @@ func (srv *Server) init() {
 		srv.UDPSize = MinMsgSize
 	}
 	if srv.MsgAcceptFunc == nil {
-		srv.MsgAcceptFunc = defaultMsgAcceptFunc
+		srv.MsgAcceptFunc = DefaultMsgAcceptFunc
+	}
+	if srv.Handler == nil {
+		srv.Handler = DefaultServeMux
 	}
 
 	srv.udpPool.New = makeUDPBuffer(srv.UDPSize)
@@ -328,7 +262,6 @@ func (srv *Server) ListenAndServe() error {
 	}
 
 	srv.init()
-	defer close(srv.queue)
 
 	switch srv.Net {
 	case "tcp", "tcp4", "tcp6":
@@ -383,7 +316,6 @@ func (srv *Server) ActivateAndServe() error {
 	}
 
 	srv.init()
-	defer close(srv.queue)
 
 	pConn := srv.PacketConn
 	l := srv.Listener
@@ -499,11 +431,7 @@ func (srv *Server) serveTCP(l net.Listener) error {
 		srv.conns[rw] = struct{}{}
 		srv.lock.Unlock()
 		wg.Add(1)
-		srv.spawnWorker(&response{
-			tsigSecret: srv.TsigSecret,
-			tcp:        rw,
-			wg:         &wg,
-		})
+		go srv.serveTCPConn(&wg, rw)
 	}
 
 	return nil
@@ -548,45 +476,21 @@ func (srv *Server) serveUDP(l *net.UDPConn) error {
 			continue
 		}
 		wg.Add(1)
-		srv.spawnWorker(&response{
-			msg:        m,
-			tsigSecret: srv.TsigSecret,
-			udp:        l,
-			udpSession: s,
-			wg:         &wg,
-		})
+		go srv.serveUDPPacket(&wg, m, l, s)
 	}
 
 	return nil
 }
 
-func (srv *Server) serve(w *response) {
+// Serve a new TCP connection.
+func (srv *Server) serveTCPConn(wg *sync.WaitGroup, rw net.Conn) {
+	w := &response{tsigSecret: srv.TsigSecret, tcp: rw}
 	if srv.DecorateWriter != nil {
 		w.writer = srv.DecorateWriter(w)
 	} else {
 		w.writer = w
 	}
 
-	if w.udp != nil {
-		// serve UDP
-		srv.serveDNS(w)
-
-		w.wg.Done()
-		return
-	}
-
-	defer func() {
-		if !w.hijacked {
-			w.Close()
-		}
-
-		srv.lock.Lock()
-		delete(srv.conns, w.tcp)
-		srv.lock.Unlock()
-
-		w.wg.Done()
-	}()
-
 	reader := Reader(defaultReader{srv})
 	if srv.DecorateReader != nil {
 		reader = srv.DecorateReader(reader)
@@ -605,14 +509,13 @@ func (srv *Server) serve(w *response) {
 	}
 
 	for q := 0; (q < limit || limit == -1) && srv.isStarted(); q++ {
-		var err error
-		w.msg, err = reader.ReadTCP(w.tcp, timeout)
+		m, err := reader.ReadTCP(w.tcp, timeout)
 		if err != nil {
 			// TODO(tmthrgd): handle error
 			break
 		}
-		srv.serveDNS(w)
-		if w.tcp == nil {
+		srv.serveDNS(m, w)
+		if w.closed {
 			break // Close() was called
 		}
 		if w.hijacked {
@@ -622,17 +525,33 @@ func (srv *Server) serve(w *response) {
 		// idle timeout.
 		timeout = idleTimeout
 	}
-}
 
-func (srv *Server) disposeBuffer(w *response) {
-	if w.udp != nil && cap(w.msg) == srv.UDPSize {
-		srv.udpPool.Put(w.msg[:srv.UDPSize])
+	if !w.hijacked {
+		w.Close()
 	}
-	w.msg = nil
+
+	srv.lock.Lock()
+	delete(srv.conns, w.tcp)
+	srv.lock.Unlock()
+
+	wg.Done()
 }
 
-func (srv *Server) serveDNS(w *response) {
-	dh, off, err := unpackMsgHdr(w.msg, 0)
+// Serve a new UDP request.
+func (srv *Server) serveUDPPacket(wg *sync.WaitGroup, m []byte, u *net.UDPConn, s *SessionUDP) {
+	w := &response{tsigSecret: srv.TsigSecret, udp: u, udpSession: s}
+	if srv.DecorateWriter != nil {
+		w.writer = srv.DecorateWriter(w)
+	} else {
+		w.writer = w
+	}
+
+	srv.serveDNS(m, w)
+	wg.Done()
+}
+
+func (srv *Server) serveDNS(m []byte, w *response) {
+	dh, off, err := unpackMsgHdr(m, 0)
 	if err != nil {
 		// Let client hang, they are sending crap; any reply can be used to amplify.
 		return
@@ -643,24 +562,24 @@ func (srv *Server) serveDNS(w *response) {
 
 	switch srv.MsgAcceptFunc(dh) {
 	case MsgAccept:
-	case MsgIgnore:
-		return
+		if req.unpack(dh, m, off) == nil {
+			break
+		}
+
+		fallthrough
 	case MsgReject:
 		req.SetRcodeFormatError(req)
 		// Are we allowed to delete any OPT records here?
 		req.Ns, req.Answer, req.Extra = nil, nil, nil
 
 		w.WriteMsg(req)
-		srv.disposeBuffer(w)
+
+		if w.udp != nil && cap(m) == srv.UDPSize {
+			srv.udpPool.Put(m[:srv.UDPSize])
+		}
+
 		return
-	}
-
-	if err := req.unpack(dh, w.msg, off); err != nil {
-		req.SetRcodeFormatError(req)
-		req.Ns, req.Answer, req.Extra = nil, nil, nil
-
-		w.WriteMsg(req)
-		srv.disposeBuffer(w)
+	case MsgIgnore:
 		return
 	}
 
@@ -668,7 +587,7 @@ func (srv *Server) serveDNS(w *response) {
 	if w.tsigSecret != nil {
 		if t := req.IsTsig(); t != nil {
 			if secret, ok := w.tsigSecret[t.Hdr.Name]; ok {
-				w.tsigStatus = TsigVerify(w.msg, secret, "", false)
+				w.tsigStatus = TsigVerify(m, secret, "", false)
 			} else {
 				w.tsigStatus = ErrSecret
 			}
@@ -677,14 +596,11 @@ func (srv *Server) serveDNS(w *response) {
 		}
 	}
 
-	srv.disposeBuffer(w)
-
-	handler := srv.Handler
-	if handler == nil {
-		handler = DefaultServeMux
+	if w.udp != nil && cap(m) == srv.UDPSize {
+		srv.udpPool.Put(m[:srv.UDPSize])
 	}
 
-	handler.ServeDNS(w, req) // Writes back to the client
+	srv.Handler.ServeDNS(w, req) // Writes back to the client
 }
 
 func (srv *Server) readTCP(conn net.Conn, timeout time.Duration) ([]byte, error) {
@@ -698,36 +614,16 @@ func (srv *Server) readTCP(conn net.Conn, timeout time.Duration) ([]byte, error)
 	}
 	srv.lock.RUnlock()
 
-	l := make([]byte, 2)
-	n, err := conn.Read(l)
-	if err != nil || n != 2 {
-		if err != nil {
-			return nil, err
-		}
-		return nil, ErrShortRead
+	var length uint16
+	if err := binary.Read(conn, binary.BigEndian, &length); err != nil {
+		return nil, err
 	}
-	length := binary.BigEndian.Uint16(l)
-	if length == 0 {
-		return nil, ErrShortRead
+
+	m := make([]byte, length)
+	if _, err := io.ReadFull(conn, m); err != nil {
+		return nil, err
 	}
-	m := make([]byte, int(length))
-	n, err = conn.Read(m[:int(length)])
-	if err != nil || n == 0 {
-		if err != nil {
-			return nil, err
-		}
-		return nil, ErrShortRead
-	}
-	i := n
-	for i < int(length) {
-		j, err := conn.Read(m[i:int(length)])
-		if err != nil {
-			return nil, err
-		}
-		i += j
-	}
-	n = i
-	m = m[:n]
+
 	return m, nil
 }
 
@@ -784,18 +680,14 @@ func (w *response) Write(m []byte) (int, error) {
 	case w.udp != nil:
 		return WriteToSessionUDP(w.udp, m, w.udpSession)
 	case w.tcp != nil:
-		lm := len(m)
-		if lm < 2 {
-			return 0, io.ErrShortBuffer
-		}
-		if lm > MaxMsgSize {
+		if len(m) > MaxMsgSize {
 			return 0, &Error{err: "message too large"}
 		}
-		l := make([]byte, 2, 2+lm)
-		binary.BigEndian.PutUint16(l, uint16(lm))
-		m = append(l, m...)
 
-		n, err := io.Copy(w.tcp, bytes.NewReader(m))
+		l := make([]byte, 2)
+		binary.BigEndian.PutUint16(l, uint16(len(m)))
+
+		n, err := (&net.Buffers{l, m}).WriteTo(w.tcp)
 		return int(n), err
 	default:
 		panic("dns: internal error: udp and tcp both nil")

vendor/github.com/miekg/dns/types.go

@@ -404,7 +404,7 @@ type RP struct {
 }
 
 func (rr *RP) String() string {
-	return rr.Hdr.String() + rr.Mbox + " " + sprintTxt([]string{rr.Txt})
+	return rr.Hdr.String() + sprintName(rr.Mbox) + " " + sprintName(rr.Txt)
 }
 
 // SOA RR. See RFC 1035.

vendor/github.com/miekg/dns/version.go

@@ -3,7 +3,7 @@ package dns
 import "fmt"
 
 // Version is current version of this library.
-var Version = V{1, 1, 4}
+var Version = V{1, 1, 6}
 
 // V holds the version of this library.
 type V struct {

vendor/github.com/miekg/dns/zduplicate.go

@@ -37,7 +37,7 @@ func (r1 *AFSDB) isDuplicate(_r2 RR) bool {
 	if r1.Subtype != r2.Subtype {
 		return false
 	}
-	if !isDulicateName(r1.Hostname, r2.Hostname) {
+	if !isDuplicateName(r1.Hostname, r2.Hostname) {
 		return false
 	}
 	return true
@@ -114,7 +114,7 @@ func (r1 *CNAME) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Target, r2.Target) {
+	if !isDuplicateName(r1.Target, r2.Target) {
 		return false
 	}
 	return true
@@ -161,7 +161,7 @@ func (r1 *DNAME) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Target, r2.Target) {
+	if !isDuplicateName(r1.Target, r2.Target) {
 		return false
 	}
 	return true
@@ -315,7 +315,7 @@ func (r1 *HIP) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	for i := 0; i < len(r1.RendezvousServers); i++ {
-		if !isDulicateName(r1.RendezvousServers[i], r2.RendezvousServers[i]) {
+		if !isDuplicateName(r1.RendezvousServers[i], r2.RendezvousServers[i]) {
 			return false
 		}
 	}
@@ -331,7 +331,7 @@ func (r1 *KX) isDuplicate(_r2 RR) bool {
 	if r1.Preference != r2.Preference {
 		return false
 	}
-	if !isDulicateName(r1.Exchanger, r2.Exchanger) {
+	if !isDuplicateName(r1.Exchanger, r2.Exchanger) {
 		return false
 	}
 	return true
@@ -406,7 +406,7 @@ func (r1 *LP) isDuplicate(_r2 RR) bool {
 	if r1.Preference != r2.Preference {
 		return false
 	}
-	if !isDulicateName(r1.Fqdn, r2.Fqdn) {
+	if !isDuplicateName(r1.Fqdn, r2.Fqdn) {
 		return false
 	}
 	return true
@@ -418,7 +418,7 @@ func (r1 *MB) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Mb, r2.Mb) {
+	if !isDuplicateName(r1.Mb, r2.Mb) {
 		return false
 	}
 	return true
@@ -430,7 +430,7 @@ func (r1 *MD) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Md, r2.Md) {
+	if !isDuplicateName(r1.Md, r2.Md) {
 		return false
 	}
 	return true
@@ -442,7 +442,7 @@ func (r1 *MF) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Mf, r2.Mf) {
+	if !isDuplicateName(r1.Mf, r2.Mf) {
 		return false
 	}
 	return true
@@ -454,7 +454,7 @@ func (r1 *MG) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Mg, r2.Mg) {
+	if !isDuplicateName(r1.Mg, r2.Mg) {
 		return false
 	}
 	return true
@@ -466,10 +466,10 @@ func (r1 *MINFO) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Rmail, r2.Rmail) {
+	if !isDuplicateName(r1.Rmail, r2.Rmail) {
 		return false
 	}
-	if !isDulicateName(r1.Email, r2.Email) {
+	if !isDuplicateName(r1.Email, r2.Email) {
 		return false
 	}
 	return true
@@ -481,7 +481,7 @@ func (r1 *MR) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Mr, r2.Mr) {
+	if !isDuplicateName(r1.Mr, r2.Mr) {
 		return false
 	}
 	return true
@@ -496,7 +496,7 @@ func (r1 *MX) isDuplicate(_r2 RR) bool {
 	if r1.Preference != r2.Preference {
 		return false
 	}
-	if !isDulicateName(r1.Mx, r2.Mx) {
+	if !isDuplicateName(r1.Mx, r2.Mx) {
 		return false
 	}
 	return true
@@ -523,7 +523,7 @@ func (r1 *NAPTR) isDuplicate(_r2 RR) bool {
 	if r1.Regexp != r2.Regexp {
 		return false
 	}
-	if !isDulicateName(r1.Replacement, r2.Replacement) {
+	if !isDuplicateName(r1.Replacement, r2.Replacement) {
 		return false
 	}
 	return true
@@ -579,7 +579,7 @@ func (r1 *NS) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Ns, r2.Ns) {
+	if !isDuplicateName(r1.Ns, r2.Ns) {
 		return false
 	}
 	return true
@@ -591,7 +591,7 @@ func (r1 *NSAPPTR) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Ptr, r2.Ptr) {
+	if !isDuplicateName(r1.Ptr, r2.Ptr) {
 		return false
 	}
 	return true
@@ -603,7 +603,7 @@ func (r1 *NSEC) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.NextDomain, r2.NextDomain) {
+	if !isDuplicateName(r1.NextDomain, r2.NextDomain) {
 		return false
 	}
 	if len(r1.TypeBitMap) != len(r2.TypeBitMap) {
@@ -709,7 +709,7 @@ func (r1 *PTR) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Ptr, r2.Ptr) {
+	if !isDuplicateName(r1.Ptr, r2.Ptr) {
 		return false
 	}
 	return true
@@ -724,10 +724,10 @@ func (r1 *PX) isDuplicate(_r2 RR) bool {
 	if r1.Preference != r2.Preference {
 		return false
 	}
-	if !isDulicateName(r1.Map822, r2.Map822) {
+	if !isDuplicateName(r1.Map822, r2.Map822) {
 		return false
 	}
-	if !isDulicateName(r1.Mapx400, r2.Mapx400) {
+	if !isDuplicateName(r1.Mapx400, r2.Mapx400) {
 		return false
 	}
 	return true
@@ -772,10 +772,10 @@ func (r1 *RP) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Mbox, r2.Mbox) {
+	if !isDuplicateName(r1.Mbox, r2.Mbox) {
 		return false
 	}
-	if !isDulicateName(r1.Txt, r2.Txt) {
+	if !isDuplicateName(r1.Txt, r2.Txt) {
 		return false
 	}
 	return true
@@ -808,7 +808,7 @@ func (r1 *RRSIG) isDuplicate(_r2 RR) bool {
 	if r1.KeyTag != r2.KeyTag {
 		return false
 	}
-	if !isDulicateName(r1.SignerName, r2.SignerName) {
+	if !isDuplicateName(r1.SignerName, r2.SignerName) {
 		return false
 	}
 	if r1.Signature != r2.Signature {
@@ -826,7 +826,7 @@ func (r1 *RT) isDuplicate(_r2 RR) bool {
 	if r1.Preference != r2.Preference {
 		return false
 	}
-	if !isDulicateName(r1.Host, r2.Host) {
+	if !isDuplicateName(r1.Host, r2.Host) {
 		return false
 	}
 	return true
@@ -859,10 +859,10 @@ func (r1 *SOA) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Ns, r2.Ns) {
+	if !isDuplicateName(r1.Ns, r2.Ns) {
 		return false
 	}
-	if !isDulicateName(r1.Mbox, r2.Mbox) {
+	if !isDuplicateName(r1.Mbox, r2.Mbox) {
 		return false
 	}
 	if r1.Serial != r2.Serial {
@@ -915,7 +915,7 @@ func (r1 *SRV) isDuplicate(_r2 RR) bool {
 	if r1.Port != r2.Port {
 		return false
 	}
-	if !isDulicateName(r1.Target, r2.Target) {
+	if !isDuplicateName(r1.Target, r2.Target) {
 		return false
 	}
 	return true
@@ -966,10 +966,10 @@ func (r1 *TALINK) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.PreviousName, r2.PreviousName) {
+	if !isDuplicateName(r1.PreviousName, r2.PreviousName) {
 		return false
 	}
-	if !isDulicateName(r1.NextName, r2.NextName) {
+	if !isDuplicateName(r1.NextName, r2.NextName) {
 		return false
 	}
 	return true
@@ -981,7 +981,7 @@ func (r1 *TKEY) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Algorithm, r2.Algorithm) {
+	if !isDuplicateName(r1.Algorithm, r2.Algorithm) {
 		return false
 	}
 	if r1.Inception != r2.Inception {
@@ -1038,7 +1038,7 @@ func (r1 *TSIG) isDuplicate(_r2 RR) bool {
 		return false
 	}
 	_ = r2
-	if !isDulicateName(r1.Algorithm, r2.Algorithm) {
+	if !isDuplicateName(r1.Algorithm, r2.Algorithm) {
 		return false
 	}
 	if r1.TimeSigned != r2.TimeSigned {