fix ipv6 issue

qwj · qwj · commit 32c6a63d6397 · 2019-04-03T17:28:38.000+08:00
diff --git a/pproxy/__doc__.py b/pproxy/__doc__.py
@@ -1,5 +1,5 @@
 __title__       = "pproxy"
-__version__     = "2.1.3"
+__version__     = "2.1.4"
 __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"
diff --git a/pproxy/server.py b/pproxy/server.py
@@ -1,4 +1,4 @@
-import argparse, time, re, asyncio, functools, base64, random, urllib.parse
+import argparse, time, re, asyncio, functools, base64, random, urllib.parse, socket
 from . import proto
 from .__doc__ import *
 
@@ -321,7 +321,7 @@ async def open_connection(self, host, port, local_addr, lbind):
                 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 30 if ':' in local_addr[0] else 2
+                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:
@@ -337,7 +337,7 @@ async def open_connection(self, host, port, local_addr, lbind):
                 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 30 if ':' in local_addr[0] else 2
+                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))
@@ -348,7 +348,7 @@ async def open_connection(self, host, port, local_addr, lbind):
                 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 30 if ':' in local_addr[0] else 2
+                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:
