diff options
author | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
---|---|---|
committer | Jim Shaver <dcypherd@gmail.com> | 2015-06-23 21:48:05 -0500 |
commit | 080e4534253338c94e6d8c86cb3679ff15410f85 (patch) | |
tree | 6322fb822332b4135f0ff14de8c2d7137016f734 /libmproxy/platform/pf.py | |
parent | db5c0b210b0133d7cd58124c727dbc24480e2568 (diff) | |
parent | 074d8d7c7463cdb1f0a90e165a4b3ada3554b4c2 (diff) | |
download | mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.gz mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.tar.bz2 mitmproxy-080e4534253338c94e6d8c86cb3679ff15410f85.zip |
Merge branch 'master' into hardfailvenv
Conflicts:
dev
Diffstat (limited to 'libmproxy/platform/pf.py')
-rw-r--r-- | libmproxy/platform/pf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/platform/pf.py b/libmproxy/platform/pf.py index 8c2f4678..97a4c192 100644 --- a/libmproxy/platform/pf.py +++ b/libmproxy/platform/pf.py @@ -13,7 +13,7 @@ def lookup(address, port, s): if "ESTABLISHED:ESTABLISHED" in i and spec in i: s = i.split() if len(s) > 4: - if sys.platform == "freebsd10": + if sys.platform.startswith("freebsd"): # strip parentheses for FreeBSD pfctl s = s[3][1:-1].split(":") else: @@ -21,4 +21,4 @@ def lookup(address, port, s): if len(s) == 2: return s[0], int(s[1]) - raise RuntimeError("Could not resolve original destination.")
\ No newline at end of file + raise RuntimeError("Could not resolve original destination.") |