From b3bb806d49498a1fd69cd4d2966a6d08c3506401 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Fri, 15 Apr 2022 03:07:32 +0700 Subject: cmd/resolver: replace populateQueries with lib/net ResolvConf Since share 9329196125fe, the populateQueries has been moved to package lib/net as a method of ResolvConf. --- cmd/resolver/resolver.go | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/cmd/resolver/resolver.go b/cmd/resolver/resolver.go index 80d837d..1c0d1d8 100644 --- a/cmd/resolver/resolver.go +++ b/cmd/resolver/resolver.go @@ -155,7 +155,7 @@ func (rsol *resolver) doCmdQuery(args []string) { fmt.Printf("= resolv.conf: %+v\n", rsol.conf) - queries = populateQueries(rsol.conf, rsol.qname) + queries = rsol.conf.PopulateQuery(rsol.qname) timeout = time.Duration(rsol.conf.Timeout) * time.Second maxAttempts = rsol.conf.Attempts } else { @@ -248,30 +248,6 @@ func (rsol *resolver) query(timeout time.Duration, qname string) (res *dns.Messa return res, nil } -func populateQueries(cr *libnet.ResolvConf, qname string) (queries []string) { - ndots := 0 - - for _, c := range qname { - if c == '.' { - ndots++ - continue - } - } - - if ndots >= cr.NDots { - queries = append(queries, qname) - } else { - if len(cr.Domain) > 0 { - queries = append(queries, qname+"."+cr.Domain) - } - for _, s := range cr.Search { - queries = append(queries, qname+"."+s) - } - } - - return -} - // printAnswers print list of DNS Answer to stdout. func printAnswers(answers []*dns.Answer) { var ( -- cgit v1.3