From 84a016dccf2aed5a949832e57e0e38dd432cdb49 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Wed, 25 Jun 2014 23:03:15 +0200 Subject: expose sockname --- libmproxy/protocol/http.py | 4 ++-- libmproxy/proxy/connection.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 69854cc9..4577b166 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -897,8 +897,8 @@ class HTTPHandler(ProtocolHandler, TemporaryServerChangeMixin): req = HTTPRequest.from_stream(self.c.client_conn.rfile, body_size_limit=self.c.config.body_size_limit) self.c.log("request", "debug", [req._assemble_first_line(req.form_in)]) - send_upstream = self.process_request(flow, req) - if not send_upstream: + send_request_upstream = self.process_request(flow, req) + if not send_request_upstream: return True # Be careful NOT to assign the request to the flow before diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py index 389a14ca..372bee2e 100644 --- a/libmproxy/proxy/connection.py +++ b/libmproxy/proxy/connection.py @@ -69,6 +69,7 @@ class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject): self.priority = priority self.peername = None + self.sockname = None self.timestamp_start = None self.timestamp_end = None self.timestamp_tcp_setup = None @@ -76,6 +77,7 @@ class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject): _stateobject_attributes = dict( peername=tuple, + sockname=tuple, timestamp_start=float, timestamp_end=float, timestamp_tcp_setup=float, @@ -117,6 +119,7 @@ class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject): self.timestamp_start = utils.timestamp() tcp.TCPClient.connect(self) self.peername = self.connection.getpeername() + self.sockname = self.connection.getsockname() self.timestamp_tcp_setup = utils.timestamp() def send(self, message): -- cgit v1.2.3