aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/flowfilter.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-02-24 15:42:52 +0100
committerGitHub <noreply@github.com>2017-02-24 15:42:52 +0100
commit83f1e2eec01ab3edec723b252b0c109f00b77c56 (patch)
tree9222f639c50e252339378e8c881474274adc8ae4 /mitmproxy/flowfilter.py
parentd0d11cec7b479932668eb4e7c99d7824018d0460 (diff)
parentfab3a8dcf4d7cdce55099172e45a6a0978eac4ab (diff)
downloadmitmproxy-83f1e2eec01ab3edec723b252b0c109f00b77c56.tar.gz
mitmproxy-83f1e2eec01ab3edec723b252b0c109f00b77c56.tar.bz2
mitmproxy-83f1e2eec01ab3edec723b252b0c109f00b77c56.zip
Merge pull request #2050 from Kriechi/create_connection
nuke tcp.Address and add proper IPv6 support
Diffstat (limited to 'mitmproxy/flowfilter.py')
-rw-r--r--mitmproxy/flowfilter.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/mitmproxy/flowfilter.py b/mitmproxy/flowfilter.py
index 4a0eeeb1..d4c0b3ea 100644
--- a/mitmproxy/flowfilter.py
+++ b/mitmproxy/flowfilter.py
@@ -348,7 +348,10 @@ class FSrc(_Rex):
is_binary = False
def __call__(self, f):
- return f.client_conn.address and self.re.search(repr(f.client_conn.address))
+ if not f.client_conn or not f.client_conn.address:
+ return False
+ r = "{}:{}".format(f.client_conn.address[0], f.client_conn.address[1])
+ return f.client_conn.address and self.re.search(r)
class FDst(_Rex):
@@ -357,7 +360,10 @@ class FDst(_Rex):
is_binary = False
def __call__(self, f):
- return f.server_conn.address and self.re.search(repr(f.server_conn.address))
+ if not f.server_conn or not f.server_conn.address:
+ return False
+ r = "{}:{}".format(f.server_conn.address[0], f.server_conn.address[1])
+ return f.server_conn.address and self.re.search(r)
class _Int(_Action):