diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-10-18 18:29:35 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-10-18 18:29:35 +0200 |
commit | e1148584380058f264b7aa7e9493115e4e8f2bbe (patch) | |
tree | d90acc5576e36808a1dea9907fe0b92130c45292 /libmproxy/protocol/primitives.py | |
parent | 52b29d49264e1397db6c65ee773479391b3fd37a (diff) | |
download | mitmproxy-e1148584380058f264b7aa7e9493115e4e8f2bbe.tar.gz mitmproxy-e1148584380058f264b7aa7e9493115e4e8f2bbe.tar.bz2 mitmproxy-e1148584380058f264b7aa7e9493115e4e8f2bbe.zip |
add generic tcp proxying, fix #374
Diffstat (limited to 'libmproxy/protocol/primitives.py')
-rw-r--r-- | libmproxy/protocol/primitives.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py index 519693db..1bf7f832 100644 --- a/libmproxy/protocol/primitives.py +++ b/libmproxy/protocol/primitives.py @@ -59,8 +59,8 @@ class Flow(stateobject.StateObject): A Flow is a collection of objects representing a single transaction. This class is usually subclassed for each protocol, e.g. HTTPFlow. """ - def __init__(self, conntype, client_conn, server_conn, live=None): - self.conntype = conntype + def __init__(self, type, client_conn, server_conn, live=None): + self.type = type self.id = str(uuid.uuid4()) self.client_conn = client_conn """@type: ClientConnection""" @@ -78,7 +78,7 @@ class Flow(stateobject.StateObject): error=Error, client_conn=ClientConnection, server_conn=ServerConnection, - conntype=str + type=str ) def get_state(self, short=False): |