From d06b4bfa4e4cc51e903b49e246d7771726a3e3a4 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 8 Sep 2014 14:32:42 +0200 Subject: remove proxy mode abstraction: always be clear which mode we are in --- libmproxy/proxy/server.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libmproxy/proxy/server.py') diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 31c50fce..f4a978ca 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -73,14 +73,16 @@ class ConnectionHandler: # Can we already identify the target server and connect to it? client_ssl, server_ssl = False, False - if self.config.get_upstream_server: - upstream_info = self.config.get_upstream_server(self.client_conn.connection) + upstream_info = self.config.mode.get_upstream_server(self.client_conn.connection) + if upstream_info: self.set_server_address(upstream_info[2:]) client_ssl, server_ssl = upstream_info[:2] if self.check_ignore_address(self.server_conn.address): self.log("Ignore host: %s:%s" % self.server_conn.address(), "info") self.conntype = "tcp" client_ssl, server_ssl = False, False + else: + pass # No upstream info from the metadata: upstream info in the protocol (e.g. HTTP absolute-form) self.channel.ask("clientconnect", self) -- cgit v1.2.3