From 0210058dd346375130d2b0675324bdf0e3705c61 Mon Sep 17 00:00:00 2001
From: caffix <caffix@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:14:26 -0400
Subject: [PATCH] fixed the db subcommand -ip output

Co-authored-by: Kaushal Mallya <chaeyib@users.noreply.github.com>
---
 cmd/amass/db.go |  4 ++++
 cmd/amass/io.go |  2 +-
 format/print.go | 20 +++++++-------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/cmd/amass/db.go b/cmd/amass/db.go
index df1903049..f2ee9ca4f 100644
--- a/cmd/amass/db.go
+++ b/cmd/amass/db.go
@@ -96,6 +96,10 @@ func runDBCommand(clArgs []string) {
 		color.Output = io.Discard
 		color.Error = io.Discard
 	}
+	if args.Options.IPs {
+		args.Options.IPv4 = true
+		args.Options.IPv6 = true
+	}
 	if args.Filepaths.Domains != "" {
 		list, err := config.GetListFromFile(args.Filepaths.Domains)
 		if err != nil {
diff --git a/cmd/amass/io.go b/cmd/amass/io.go
index 2ae9de68b..bf827a881 100644
--- a/cmd/amass/io.go
+++ b/cmd/amass/io.go
@@ -152,7 +152,7 @@ func EventOutput(ctx context.Context, g *netmap.Graph, domains []string, since t
 		lookup[n] = o
 	}
 	// Build the lookup map used to create the final result set
-	if pairs, err := g.NamesToAddrs(ctx, since, names...); err == nil {
+	if pairs, err := g.NamesToAddrs(ctx, qtime, names...); err == nil {
 		for _, p := range pairs {
 			addr := p.Addr.Address.String()
 
diff --git a/format/print.go b/format/print.go
index 31bba70e5..f0027237f 100644
--- a/format/print.go
+++ b/format/print.go
@@ -197,9 +197,6 @@ func OutputLineParts(out *requests.Output, addrs, demo bool) (name, ips string)
 				ips += a.Address.String()
 			}
 		}
-		if ips == "" {
-			ips = "N/A"
-		}
 	}
 	name = out.Name
 	if demo {
@@ -210,20 +207,17 @@ func OutputLineParts(out *requests.Output, addrs, demo bool) (name, ips string)
 
 // DesiredAddrTypes removes undesired address types from the AddressInfo slice.
 func DesiredAddrTypes(addrs []requests.AddressInfo, ipv4, ipv6 bool) []requests.AddressInfo {
-	if !ipv4 && !ipv6 {
-		return addrs
-	}
+	var kept []requests.AddressInfo
 
-	var keep []requests.AddressInfo
 	for _, addr := range addrs {
-		if amassnet.IsIPv4(addr.Address) && !ipv4 {
-			continue
-		} else if amassnet.IsIPv6(addr.Address) && !ipv6 {
-			continue
+		if ipv4 && amassnet.IsIPv4(addr.Address) {
+			kept = append(kept, addr)
+		} else if ipv6 && amassnet.IsIPv6(addr.Address) {
+			kept = append(kept, addr)
 		}
-		keep = append(keep, addr)
 	}
-	return keep
+
+	return kept
 }
 
 // InterfaceInfo returns network interface information specific to the current host.