diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
| commit | 729677cd85cffedec8f481f1b6025f00fb637e13 (patch) | |
| tree | 39c245643c5a3a48bd14c6e13757148bda54e2f3 /libmproxy/platform/osx.py | |
| parent | 6fe175913e611097fdfdf0a6b20b1c05909374e1 (diff) | |
| parent | a558c016d4430b67d221a369abe0cde1f4a40fce (diff) | |
| download | mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.gz mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.bz2 mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'libmproxy/platform/osx.py')
| -rw-r--r-- | libmproxy/platform/osx.py | 8 |
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) |