khcloud-python
diff --git a/‎pproxy/__doc__.py‎
Lines changed: 1 addition & 1 deletion b/‎pproxy/__doc__.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎pproxy/server.py‎
Lines changed: 3 additions & 6 deletions b/‎pproxy/server.py‎
Lines changed: 3 additions & 6 deletions
@@ -1,5 +1,5 @@
 __title__       = "pproxy"
-__version__     = "2.1.6"
+__version__     = "2.1.7"
 __license__     = "MIT"
 __description__ = "Proxy server that can tunnel among remote servers by regex rules."
 __keywords__    = "proxy socks http shadowsocks shadowsocksr ssr redirect pf tunnel cipher ssl udp"
 
@@ -322,11 +322,12 @@ async def open_connection(self, host, port, local_addr, lbind):
                     await self.streams
                 return self.streams.result()
         try:
+            local_addr = local_addr if self.lbind == 'in' else (self.lbind, 0) if self.lbind else \
+                         local_addr if lbind == 'in' else (lbind, 0) if lbind else None
+            family = 0 if local_addr is None else socket.AF_INET6 if ':' in local_addr[0] else socket.AF_INET
             if self.direct:
                 if host == 'tunnel':
                     raise Exception('Unknown tunnel endpoint')
-                local_addr = local_addr if lbind == 'in' else (lbind, 0) if lbind else None
-                family = 0 if local_addr is None else socket.AF_INET6 if ':' in local_addr[0] else socket.AF_INET
                 wait = asyncio.open_connection(host=host, port=port, local_addr=local_addr, family=family)
             elif self.ssh:
                 try:
@@ -341,8 +342,6 @@ async def open_connection(self, host, port, local_addr, lbind):
                     password = None
                 else:
                     client_keys = None
-                local_addr = local_addr if self.lbind == 'in' else (self.lbind, 0) if self.lbind else None
-                family = 0 if local_addr is None else socket.AF_INET6 if ':' in local_addr[0] else socket.AF_INET
                 conn = await asyncssh.connect(host=self.host_name, port=self.port, local_addr=local_addr, family=family, x509_trusted_certs=None, known_hosts=None, username=username, password=password, client_keys=client_keys)
                 if not self.streams.done():
                     self.streams.set_result((conn, None))
@@ -352,8 +351,6 @@ async def open_connection(self, host, port, local_addr, lbind):
             elif self.unix:
                 wait = asyncio.open_unix_connection(path=self.bind, ssl=self.sslclient, server_hostname='' if self.sslclient else None)
             else:
-                local_addr = local_addr if self.lbind == 'in' else (self.lbind, 0) if self.lbind else None
-                family = 0 if local_addr is None else socket.AF_INET6 if ':' in local_addr[0] else socket.AF_INET
                 wait = asyncio.open_connection(host=self.host_name, port=self.port, ssl=self.sslclient, local_addr=local_addr, family=family)
             reader, writer = await asyncio.wait_for(wait, timeout=SOCKET_TIMEOUT)
         except Exception as ex: