aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/platform/osx.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-06-16 16:23:36 +1200
committerAldo Cortesi <aldo@nullcube.com>2013-06-16 16:23:36 +1200
commit886970040ba3a61ecfd20efbe15cb3e3855437c5 (patch)
treead1ca2c6efd520b6f0889c1410f07f675777848d /libmproxy/platform/osx.py
parentc1a60a1f6b4713f93c27052937759a01db72c428 (diff)
downloadmitmproxy-886970040ba3a61ecfd20efbe15cb3e3855437c5.tar.gz
mitmproxy-886970040ba3a61ecfd20efbe15cb3e3855437c5.tar.bz2
mitmproxy-886970040ba3a61ecfd20efbe15cb3e3855437c5.zip
Revert "Use lsof instead of pfctl to find target host on OSX in transparent mode."
This reverts commit ffeede9b39c8d269766fd56d02eb7e78d8d13bb2.
Diffstat (limited to 'libmproxy/platform/osx.py')
-rw-r--r--libmproxy/platform/osx.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/platform/osx.py b/libmproxy/platform/osx.py
index 1a474e94..dda5d9af 100644
--- a/libmproxy/platform/osx.py
+++ b/libmproxy/platform/osx.py
@@ -1,16 +1,16 @@
import subprocess
-import lsof
+import pf
"""
Doing this the "right" way by using DIOCNATLOOK on the pf device turns out
to be a pain. Apple has made a number of modifications to the data
structures returned, and compiling userspace tools to test and work with
- this turns out to be a pain in the ass. Parsing lsof output is short,
+ this turns out to be a pain in the ass. Parsing pfctl output is short,
simple, and works.
"""
class Resolver:
- STATECMD = ("sudo", "-n", "/usr/sbin/lsof", "-n", "-P", "-i", "TCP")
+ STATECMD = ("sudo", "-n", "/sbin/pfctl", "-s", "state")
def __init__(self):
pass
@@ -20,4 +20,4 @@ class Resolver:
stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
return None
- return lsof.lookup(peer[0], peer[1], stxt)
+ return pf.lookup(peer[0], peer[1], stxt)