From 767c81071d0103d28cbef32c75ea03c038c2c9ab Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <brad@danga.com>
Date: Fri, 27 Apr 2012 18:51:07 -0700
Subject: [PATCH] netutil: change mac lsof args. might be faster. didn't fix
 previous deadlock, though.

Change-Id: I159e9de4526683ae2f1fd2c18042b94e20029fdb
---
 pkg/netutil/ident.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkg/netutil/ident.go b/pkg/netutil/ident.go
index 1f595267d..255c0dac7 100644
--- a/pkg/netutil/ident.go
+++ b/pkg/netutil/ident.go
@@ -121,7 +121,15 @@ func (p maybeBrackets) String() string {
 func uidFromDarwinLsof(lip net.IP, lport int, rip net.IP, rport int) (uid int, err error) {
 	seek := fmt.Sprintf("%s:%d->%s:%d", maybeBrackets(lip), lport, maybeBrackets(rip), rport)
 	seekb := []byte(seek)
-	cmd := exec.Command("lsof", "-a", "-n", "-i", "-P")
+	cmd := exec.Command("lsof",
+		"-b",    // avoid system calls that could block
+		"-w",    // and don't warn about cases where -b fails
+		"-n",    // don't resolve network names
+		"-P",    // don't resolve network ports,
+		// TODO(bradfitz): pass down the uid we care about, then do: ?
+		//"-a",  // AND the following together:
+		// "-u", strconv.Itoa(uid)  // just this uid
+		"-itcp") // we only care about TCP connections
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
 		return