Merge remote-tracking branch 'base/master'

1 files changed, 14 insertions, 5 deletions

diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py
index 519693db..3be1cc45 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):
@@ -174,7 +174,7 @@ class LiveConnection(object):
         self._backup_server_conn = None
         """@type: libmproxy.proxy.connection.ServerConnection"""
 
-    def change_server(self, address, ssl=None, force=False, persistent_change=False):
+    def change_server(self, address, ssl=None, sni=None, force=False, persistent_change=False):
         """
         Change the server connection to the specified address.
         @returns:
@@ -183,7 +183,14 @@ class LiveConnection(object):
         """
         address = netlib.tcp.Address.wrap(address)
 
-        ssl_mismatch = (ssl is not None and ssl != self.c.server_conn.ssl_established)
+        ssl_mismatch = (
+            ssl is not None and
+            (
+                ssl != self.c.server_conn.ssl_established
+                or
+                (sni is not None and sni != self.c.sni)
+            )
+        )
         address_mismatch = (address != self.c.server_conn.address)
 
         if persistent_change:
@@ -212,6 +219,8 @@ class LiveConnection(object):
 
             self.c.set_server_address(address)
             self.c.establish_server_connection(ask=False)
+            if sni:
+                self.c.sni = sni
             if ssl:
                 self.c.establish_ssl(server=True)
             return True