diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-01-01 11:24:11 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-01-01 11:24:11 +1300 |
| commit | e42136a6ef6f29a16cb2eb5f566be317ed7f3579 (patch) | |
| tree | 91ef19d2be91cd3ed34ac88b619eaa0362a3f0dc /libmproxy/platform/osx.py | |
| parent | e2dc7ba09d54fb4fa4af796d5c37cd36174f8897 (diff) | |
| download | mitmproxy-e42136a6ef6f29a16cb2eb5f566be317ed7f3579.tar.gz mitmproxy-e42136a6ef6f29a16cb2eb5f566be317ed7f3579.tar.bz2 mitmproxy-e42136a6ef6f29a16cb2eb5f566be317ed7f3579.zip | |
Better error handling for transparent mode remote address resolution.
Diffstat (limited to 'libmproxy/platform/osx.py')
| -rw-r--r-- | libmproxy/platform/osx.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmproxy/platform/osx.py b/libmproxy/platform/osx.py index d1c420e2..dda5d9af 100644 --- a/libmproxy/platform/osx.py +++ b/libmproxy/platform/osx.py @@ -16,5 +16,8 @@ class Resolver: def original_addr(self, csock): peer = csock.getpeername() - stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT) + try: + stxt = subprocess.check_output(self.STATECMD, stderr=subprocess.STDOUT) + except subprocess.CalledProcessError: + return None return pf.lookup(peer[0], peer[1], stxt) |