Refactor

Author: 42wim

check/glue.go

@@ -130,7 +130,7 @@ func (g *Glue) getGlueIPs(domain string, server string) ([]net.IP, error) {
 	log.Debugf("GLUE: getGlueIPs")
 	defer log.Debugf("GLUE: getGlueIPs exit")
 	var ips []net.IP
-	res, err := g.s.Query(domain, dns.TypeNS, server, true)
+	res, err := scan.Query(domain, dns.TypeNS, server, true)
 	if err != nil {
 		return ips, err
 	}

main.go

@@ -37,7 +37,7 @@ func printHelp() {
 	flag.PrintDefaults()
 }
 
-func main() {
+func initScan() *scan.Scan {
 	var resolver string
 	flagDebug = flag.Bool("debug", false, "enable debug")
 	flagScan = flag.Bool("scan", false, "scan domain for common records")
@@ -49,7 +49,7 @@ func main() {
 
 	if len(flag.Args()) == 0 {
 		printHelp()
-		return
+		os.Exit(0)
 	}
 
 	if *flagDebug {
@@ -58,13 +58,17 @@ func main() {
 	if !*flagJSON {
 		fmt.Printf("using %s as resolver\n", resolver)
 	}
-
-	domain := flag.Arg(0)
 	s := scan.New(&scan.Config{
 		JSON:  flagJSON,
 		Debug: flagDebug,
 		QPS:   flagQPS,
 	}, resolver)
+	return s
+}
+
+func main() {
+	s := initScan()
+	domain := flag.Arg(0)
 	nsdatas, err := s.FindNS(dns.Fqdn(domain))
 	if len(nsdatas) == 0 {
 		fmt.Println("no nameservers found for", domain)
@@ -76,15 +80,6 @@ func main() {
 	}
 	var domainReport check.DomainReport
 	createNSHeader(s, domain, nsdatas, &domainReport)
-
-	// enable debug again if needed
-	if *flagDebug {
-		log.Level = logrus.DebugLevel
-	}
-
-	if !IPv6Guess {
-		nsdatas = removeIPv6(nsdatas)
-	}
 	doDomainReport(s, domain, nsdatas, &domainReport)
 }
 
@@ -106,6 +101,9 @@ func execCheckers(s *scan.Scan, domain string, nsdatas []structs.NSData, domainR
 }
 
 func doDomainReport(s *scan.Scan, domain string, nsdatas []structs.NSData, domainReport *check.DomainReport) {
+	if !IPv6Guess {
+		nsdatas = removeIPv6(nsdatas)
+	}
 	domainReport.Name = domain
 	sp := spinner.New(spinner.CharSets[14], 100*time.Millisecond)
 	sp.Writer = os.Stderr
@@ -181,4 +179,9 @@ func createNSHeader(s *scan.Scan, domain string, nsdatas []structs.NSData, domai
 	close(wc)
 	sp.Stop()
 	<-done
+
+	//enable debug again
+	if *flagDebug {
+		log.Level = logrus.DebugLevel
+	}
 }

scan/scan.go

@@ -295,3 +295,11 @@ func (s *Scan) Resolver() string {
 func (s *Scan) NSData() map[string][]structs.NSData {
 	return s.nsdataCache
 }
+
+func Query(q string, qtype uint16, server string, sec bool) (structs.Response, error) {
+	return query(q, qtype, server, sec)
+}
+
+func QueryRRset(q string, qtype uint16, server string, sec bool) ([]dns.RR, time.Duration, error) {
+	return queryRRset(q, qtype, server, sec)
+}

scan/utils.go

@@ -35,10 +35,6 @@ func extractIP(rrset []dns.RR) []net.IP {
 	return ips
 }
 
-func (s *Scan) ExtractRR(rrset []dns.RR, qtypes ...uint16) []dns.RR {
-	return extractRR(rrset, qtypes...)
-}
-
 func extractRR(rrset []dns.RR, qtypes ...uint16) []dns.RR {
 	var out []dns.RR
 	m := make(map[uint16]bool)
@@ -53,14 +49,6 @@ func extractRR(rrset []dns.RR, qtypes ...uint16) []dns.RR {
 	return out
 }
 
-func (s *Scan) Query(q string, qtype uint16, server string, sec bool) (structs.Response, error) {
-	return query(q, qtype, server, sec)
-}
-
-func Query(q string, qtype uint16, server string, sec bool) (structs.Response, error) {
-	return query(q, qtype, server, sec)
-}
-
 func query(q string, qtype uint16, server string, sec bool) (structs.Response, error) {
 	c := new(dns.Client)
 	m := prepMsg()
@@ -88,14 +76,6 @@ func query(q string, qtype uint16, server string, sec bool) (structs.Response, e
 	return structs.Response{Msg: in, Server: server, Rtt: rtt}, nil
 }
 
-func (s *Scan) QueryRRset(q string, qtype uint16, server string, sec bool) ([]dns.RR, time.Duration, error) {
-	return queryRRset(q, qtype, server, sec)
-}
-
-func QueryRRset(q string, qtype uint16, server string, sec bool) ([]dns.RR, time.Duration, error) {
-	return queryRRset(q, qtype, server, sec)
-}
-
 func queryRRset(q string, qtype uint16, server string, sec bool) ([]dns.RR, time.Duration, error) {
 	res, err := query(q, qtype, server, sec)
 	if err != nil {