ipv6 support

Author: Xetera

internal/discovery/fingerprint.go

@@ -61,11 +61,14 @@ func DiscoverServices(ctx context.Context, targets []ScanTarget, results chan<-
 			}
 
 			log.Printf("fingerprint: scanning %d targets (attempt %d)\n", len(t), attempt+1)
+			for _, target := range t {
+				log.Printf("	Scanning target %s\n", target.Address.String())
+			}
 			scanned, err := scan.ScanTargets(t, scan.Config{
 				UDP:            false,
 				FastMode:       false,
 				Verbose:        false,
-				DefaultTimeout: time.Second,
+				DefaultTimeout: 2 * time.Second,
 			})
 			if err != nil {
 				log.Printf("fingerprint: scan error (attempt %d): %v\n", attempt+1, err)

internal/discovery/process.go

@@ -206,7 +206,7 @@ func (w *ProcessWatcher) processEntry(state *scanState, entry portEntry) {
 		return
 	}
 
-	w.addListeningProcess(state, pid, port, subdomain, cwd, needsCustomMapping)
+	w.addListeningProcess(state, pid, port, ip, subdomain, cwd, needsCustomMapping)
 	state.usedPorts[port] = true
 }
 
@@ -248,14 +248,14 @@ func (w *ProcessWatcher) addWellKnownProcess(state *scanState, pid int, port int
 	state.usedPorts[port] = true
 }
 
-func (w *ProcessWatcher) addListeningProcess(state *scanState, pid int, port int, subdomain string, cwd string, needsCustomMapping bool) {
+func (w *ProcessWatcher) addListeningProcess(state *scanState, pid int, port int, ip string, subdomain string, cwd string, needsCustomMapping bool) {
 	if state.seenPID[pid] {
 		return
 	}
 	state.results = append(state.results, DiscoveredService{
 		Subdomain: subdomain,
 		Port:      port,
-		IP:        "127.0.0.1",
+		IP:        ip,
 		Source:    RouteSourceProcess,
 		Process: &ProcessInfo{
 			PID:                pid,

internal/discovery/process_darwin.go

@@ -24,6 +24,7 @@ import "C"
 
 import (
 	"bufio"
+	"fmt"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -82,7 +83,10 @@ func (w *ProcessWatcher) getListeningPorts() ([]portEntry, error) {
 		ipStr := addr[:colonIdx]
 		if ipStr == "*" {
 			ipStr = "127.0.0.1"
+		} else if strings.HasPrefix(ipStr, "[") && strings.HasSuffix(ipStr, "]") {
+			ipStr = ipStr[1 : len(ipStr)-1]
 		}
+		fmt.Println("IP", ipStr)
 
 		result = append(result, portEntry{PID: pid, Port: port, IP: ipStr})
 	}

internal/discovery/process_nocgo_darwin.go

@@ -61,6 +61,8 @@ func (w *ProcessWatcher) getListeningPorts() ([]portEntry, error) {
 		ipStr := addr[:colonIdx]
 		if ipStr == "*" {
 			ipStr = "127.0.0.1"
+		} else if strings.HasPrefix(ipStr, "[") && strings.HasSuffix(ipStr, "]") {
+			ipStr = ipStr[1 : len(ipStr)-1]
 		}
 
 		result = append(result, portEntry{PID: pid, Port: port, IP: ipStr})