aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/filt.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-02 01:16:48 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-02 01:16:48 +0200
commitc14fbc7794eee2a60d3c90f818ec481cf9db544b (patch)
tree529949dc40052291460b485142330932cf51819a /libmproxy/filt.py
parente8de7595c2e8a98418593e90b886e45a745e234a (diff)
parentf1c8b47b1eb153d448061c0ddce21030c31af2b7 (diff)
downloadmitmproxy-c14fbc7794eee2a60d3c90f818ec481cf9db544b.tar.gz
mitmproxy-c14fbc7794eee2a60d3c90f818ec481cf9db544b.tar.bz2
mitmproxy-c14fbc7794eee2a60d3c90f818ec481cf9db544b.zip
Merge pull request #741 from mitmproxy/proxy-refactor-cb
Proxy Refactor
Diffstat (limited to 'libmproxy/filt.py')
-rw-r--r--libmproxy/filt.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/filt.py b/libmproxy/filt.py
index bd17a807..cfd3a1bc 100644
--- a/libmproxy/filt.py
+++ b/libmproxy/filt.py
@@ -35,7 +35,7 @@ from __future__ import absolute_import
import re
import sys
import pyparsing as pp
-from .protocol.http import decoded
+from .models import decoded
class _Token:
@@ -246,14 +246,14 @@ class FSrc(_Rex):
help = "Match source address"
def __call__(self, f):
- return f.client_conn and re.search(self.expr, repr(f.client_conn.address))
+ return f.client_conn.address and re.search(self.expr, repr(f.client_conn.address))
class FDst(_Rex):
code = "dst"
help = "Match destination address"
def __call__(self, f):
- return f.server_conn and re.search(self.expr, repr(f.server_conn.address))
+ return f.server_conn.address and re.search(self.expr, repr(f.server_conn.address))
class _Int(_Action):
def __init__(self, num):