feat: working finally

pkg/models/models.go

@@ -1,12 +0,0 @@
-package models
-
-// Question represents a given query to the client.
-// A question can have multiple domains, multiple nameservers
-// but it's the responsibility of the client to send each question
-// to the nameserver and collect responses.
-type Question struct {
-	Domain      []string
-	Nameservers []string
-	QClass      []uint16
-	QType       []uint16
-}

pkg/resolve/nameserver.go

@@ -1,33 +0,0 @@
-package resolve
-
-import (
-	"bufio"
-	"os"
-	"strings"
-)
-
-// GetDefaultNameserver reads `/etc/resolv.conf` to determine the default
-// nameserver configured. Returns an error if unable to parse or
-// no nameserver specified. It returns as soon as it finds a line
-// with `nameserver` prefix.
-// An example format:
-// `nameserver 127.0.0.1`
-
-func GetDefaultNameserver() (string, error) {
-	file, err := os.Open("/etc/resolv.conf")
-	if err != nil {
-		return "", err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		if strings.HasPrefix(scanner.Text(), "nameserver") {
-			return strings.Fields(scanner.Text())[1], nil
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return "", err
-	}
-	return "", err
-}

pkg/resolve/resolver.go

@@ -54,30 +54,24 @@ func NewResolverFromResolvFile(resolvFilePath string) (*Resolver, error) {
 	}, nil
 }
 
-func (r *Resolver) Lookup(domains []string) []error {
-	// Prepare a list of DNS messages to be sent to the server.
-	// It's possible to send multiple question in one message
-	// but some nameservers are not able to
-	var messages = make([]dns.Msg, 0, len(domains))
-
-	for _, d := range domains {
+// Lookup prepare a list of DNS messages to be sent to the server.
+// It's possible to send multiple question in one message
+// but some nameservers are not able to
+func (r *Resolver) Lookup(questions []dns.Question) error {
+	var messages = make([]dns.Msg, 0, len(questions))
+	for _, q := range questions {
 		msg := dns.Msg{}
 		msg.Id = dns.Id()
 		msg.RecursionDesired = true
 		// It's recommended to only send 1 question for 1 DNS message.
-		msg.Question = []dns.Question{(dns.Question{
-			Name:   dns.Fqdn(d),
-			Qtype:  dns.TypeA,
-			Qclass: dns.ClassINET,
-		})}
+		msg.Question = []dns.Question{q}
 		messages = append(messages, msg)
 	}
-	var errors []error
 	for _, msg := range messages {
 		for _, srv := range r.servers {
 			in, rtt, err := r.client.Exchange(&msg, srv)
 			if err != nil {
-				errors = append(errors, err)
+				return err
 			}
 			for _, ans := range in.Answer {
 				if t, ok := ans.(*dns.A); ok {
@@ -87,5 +81,5 @@ func (r *Resolver) Lookup(domains []string) []error {
 			fmt.Println("rtt is", rtt, msg.Question)
 		}
 	}
-	return errors
+	return nil
 }