diff --git a/v1/cmd/blink/main.go b/v1/cmd/blink/main.go index aa210c8..345e846 100644 --- a/v1/cmd/blink/main.go +++ b/v1/cmd/blink/main.go @@ -9,6 +9,7 @@ import ( "git.supernets.org/perp/blink/v1/internal/bar" "git.supernets.org/perp/blink/v1/internal/file" + "git.supernets.org/perp/blink/v1/internal/util" "git.supernets.org/perp/blink/v1/pkg/dns" "git.supernets.org/perp/blink/v1/pkg/runner" "github.com/fatih/color" @@ -80,26 +81,15 @@ var rootCmd = &cobra.Command{ if err != nil { panic(err) } + resolversLines = util.Port(resolversLines) slices.Sort(resolversLines) opts.Resolvers = slices.Compact(resolversLines) - // Warnings - if opts.UDP { - log.Warn().Msg("UDP is enabled") - } - - if opts.IPv6 { - log.Warn().Msg("IPv6 is enabled") - } - // Store domains domains := make(map[string]int) - // Store task count - tasks := len(opts.Wordlist) * len(opts.Domains) - // Create bar - pb := bar.New(tasks) + pb := bar.New(len(opts.Wordlist) * len(opts.Domains)) // Handle results opts.OnResult = func(result *dns.Result) { @@ -148,6 +138,15 @@ var rootCmd = &cobra.Command{ // Create runner run := runner.New(&opts) + // Print warnings + if opts.UDP { + log.Warn().Msg("UDP is enabled") + } + + if opts.IPv6 { + log.Warn().Msg("IPv6 is enabled") + } + // Wildcard enabled if wildcard { // Go through domains @@ -178,9 +177,9 @@ func init() { rootCmd.Flags().StringVarP(&resolvers, "resolvers", "r", "", "Path to resolvers") rootCmd.Flags().BoolVarP(&opts.UDP, "udp", "u", false, "Query using UDP") rootCmd.Flags().BoolVarP(&opts.IPv6, "ipv6", "i", false, "Query for IPv6") - rootCmd.Flags().BoolVarP(&wildcard, "wildcard", "c", false, "Query for wildcard") - rootCmd.Flags().IntVarP(&opts.Timeout, "timeout", "d", 5, "Query timeout") - rootCmd.Flags().IntVarP(&opts.Threads, "threads", "t", 1, "Concurrent threads") + rootCmd.Flags().BoolVarP(&wildcard, "wildcard", "d", false, "Query for wildcard") + rootCmd.Flags().IntVarP(&opts.Timeout, "timeout", "t", 5, "Query timeout") + rootCmd.Flags().IntVarP(&opts.Threads, "threads", "c", 1, "Concurrent threads") rootCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "Verbose logging") // Set flag options