diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-04-27 04:41:51 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-04-27 04:41:51 +0200 |
| commit | 90dff4a8a15580cf3e86d29c6aba1f97410a0b89 (patch) | |
| tree | c63f1c8bf2a8783b477096fc59f066042edc2168 /libmproxy | |
| parent | ca9dfff4b56cd73f48ac66e66ced94c95ce5a131 (diff) | |
| parent | b942f98f372abec974968d88119b5b573e4cb39c (diff) | |
| download | mitmproxy-90dff4a8a15580cf3e86d29c6aba1f97410a0b89.tar.gz mitmproxy-90dff4a8a15580cf3e86d29c6aba1f97410a0b89.tar.bz2 mitmproxy-90dff4a8a15580cf3e86d29c6aba1f97410a0b89.zip | |
Merge pull request #569 from mike-pt/master
Match all freebsd versions and not just freebsd10
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/platform/__init__.py | 4 | ||||
| -rw-r--r-- | libmproxy/platform/pf.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/platform/__init__.py b/libmproxy/platform/__init__.py index 1b2cf909..e1ff7c47 100644 --- a/libmproxy/platform/__init__.py +++ b/libmproxy/platform/__init__.py @@ -8,9 +8,9 @@ if sys.platform == "linux2": elif sys.platform == "darwin": from . import osx resolver = osx.Resolver -elif sys.platform == "freebsd10": +elif sys.platform.startswith("freebsd"): from . import osx resolver = osx.Resolver elif sys.platform == "win32": from . import windows - resolver = windows.Resolver
\ No newline at end of file + resolver = windows.Resolver 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.") |