adding output ip

Author: Mzack9999

pkg/runner/output.go

@@ -10,7 +10,8 @@ import (
 
 // JSONResult contains the result for a host in JSON format
 type JSONResult struct {
-	Host string `json:"host"`
+	Host string `json:"host,omitempty"`
+	Ip   string `json:"ip,omitempty"`
 	Port int    `json:"port"`
 }
 
@@ -36,11 +37,14 @@ func WriteHostOutput(host string, ports map[int]struct{}, writer io.Writer) erro
 }
 
 // WriteJSONOutput writes the output list of subdomain in JSON to an io.Writer
-func WriteJSONOutput(host string, ports map[int]struct{}, writer io.Writer) error {
+func WriteJSONOutput(host, ip string, ports map[int]struct{}, writer io.Writer) error {
 	encoder := json.NewEncoder(writer)
 
 	data := JSONResult{}
-	data.Host = host
+	if host != ip {
+		data.Host = host
+	}
+	data.Ip = ip
 
 	for port := range ports {
 		data.Port = port

pkg/runner/runner.go

@@ -235,7 +235,10 @@ func (r *Runner) handleOutput() {
 
 			// console output
 			if r.options.JSON {
-				data := JSONResult{Host: host}
+				data := JSONResult{Ip: hostIp}
+				if host != hostIp {
+					data.Host = host
+				}
 				for port := range ports {
 					data.Port = port
 					b, err := json.Marshal(data)
@@ -253,7 +256,7 @@ func (r *Runner) handleOutput() {
 			// file output
 			if file != nil {
 				if r.options.JSON {
-					err = WriteJSONOutput(host, ports, file)
+					err = WriteJSONOutput(host, hostIp, ports, file)
 				} else {
 					err = WriteHostOutput(host, ports, file)
 				}

pkg/runner/targets.go

@@ -83,7 +83,7 @@ func (r *Runner) addOrExpand(target string) error {
 	}
 
 	// If the user has specified ping probes, perform ping on addresses
-	if r.options.Ping && len(initialHosts) > 1 {
+	if isRoot() && r.options.Ping && len(initialHosts) > 1 {
 		// Scan the hosts found for ping probes
 		pingResults, err := scan.PingHosts(initialHosts)
 		if err != nil {