[tor-commits] [arm/master] Making lsof the sole connection resolver on macs

[atagar at torproject.org]

commit cd6a6873e753fa4497250ab1c5c332f3e6fe86cf
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Apr 25 19:21:56 2011 -0700

    Making lsof the sole connection resolver on macs
    
    On macs connection resolver detection from the path isn't working, and
    aparently only lsof is available. This results in us trying (and failing) all
    of the other resolvers before falling back to something that works. This drops
    us straight to using lsof on macs.
---
 src/util/connections.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/util/connections.py b/src/util/connections.py
index a797e7b..f632306 100644
--- a/src/util/connections.py
+++ b/src/util/connections.py
@@ -337,6 +337,8 @@ def getSystemResolvers(osType = None):
   
   if osType == "FreeBSD":
     resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF]
+  elif osType == "Darwin":
+    resolvers = [Resolver.LSOF]
   else:
     resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS]