From fe77dd35c67a0dfbd3004fefe97c689f8cfd3291 Mon Sep 17 00:00:00 2001 From: Sandor Nemes Date: Fri, 8 Jan 2016 15:46:59 +0100 Subject: Fixed a problem with the bind address not being used as the source address on outgoing TCP packets --- libmproxy/protocol/base.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libmproxy/protocol/base.py') diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py index af6b1c3b..8a1bea91 100644 --- a/libmproxy/protocol/base.py +++ b/libmproxy/protocol/base.py @@ -109,9 +109,9 @@ class ServerConnectionMixin(object): self.disconnect() """ - def __init__(self, server_address=None): + def __init__(self, server_address=None, source_address=None): super(ServerConnectionMixin, self).__init__() - self.server_conn = ServerConnection(server_address) + self.server_conn = ServerConnection(server_address, source_address) self.__check_self_connect() def __check_self_connect(self): @@ -157,10 +157,11 @@ class ServerConnectionMixin(object): """ self.log("serverdisconnect", "debug", [repr(self.server_conn.address)]) address = self.server_conn.address + source_address = self.server_conn.source_address()[0] self.server_conn.finish() self.server_conn.close() self.channel.tell("serverdisconnect", self.server_conn) - self.server_conn = ServerConnection(address) + self.server_conn = ServerConnection(address, source_address) def connect(self): """ -- cgit v1.2.3 From 918a457f5a6e4b3281f86ba31107d0a05082fb5e Mon Sep 17 00:00:00 2001 From: Sandor Nemes Date: Mon, 18 Jan 2016 09:55:46 +0100 Subject: Minor aesthetic fixes. --- libmproxy/protocol/base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmproxy/protocol/base.py') diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py index 8a1bea91..cf8771e0 100644 --- a/libmproxy/protocol/base.py +++ b/libmproxy/protocol/base.py @@ -109,9 +109,9 @@ class ServerConnectionMixin(object): self.disconnect() """ - def __init__(self, server_address=None, source_address=None): + def __init__(self, server_address=None): super(ServerConnectionMixin, self).__init__() - self.server_conn = ServerConnection(server_address, source_address) + self.server_conn = ServerConnection(server_address) self.__check_self_connect() def __check_self_connect(self): @@ -157,7 +157,7 @@ class ServerConnectionMixin(object): """ self.log("serverdisconnect", "debug", [repr(self.server_conn.address)]) address = self.server_conn.address - source_address = self.server_conn.source_address()[0] + source_address = self.server_conn.source_address self.server_conn.finish() self.server_conn.close() self.channel.tell("serverdisconnect", self.server_conn) -- cgit v1.2.3 From 61bd318622fbb3035ad2ff07315ef328e4aad503 Mon Sep 17 00:00:00 2001 From: Sandor Nemes Date: Mon, 18 Jan 2016 15:52:03 +0100 Subject: remove unnecessary source_address from proxy modes --- libmproxy/protocol/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmproxy/protocol/base.py') diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py index cf8771e0..d984cadb 100644 --- a/libmproxy/protocol/base.py +++ b/libmproxy/protocol/base.py @@ -111,7 +111,7 @@ class ServerConnectionMixin(object): def __init__(self, server_address=None): super(ServerConnectionMixin, self).__init__() - self.server_conn = ServerConnection(server_address) + self.server_conn = ServerConnection(server_address, (self.config.host, 0)) self.__check_self_connect() def __check_self_connect(self): -- cgit v1.2.3