vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use only ipv4 dns server

Browse source
This commit is contained in:
clowwindy 2014-08-10 12:23:44 +08:00
parent 8165904eaf
commit e51aa4f137
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
2.1.0 2014-08-10
- Use only IPv4 DNS server
2.1.0 2014-08-01 2.1.0 2014-08-01
- Does not ship config.json - Does not ship config.json
- Better error message - Better error message

2
setup.py
View file

@ -6,7 +6,7 @@ with open('README.rst') as f:
setup( setup(
name="shadowsocks", name="shadowsocks",
version="3.0", version="2.1.0",
license='MIT', license='MIT',
description="A fast tunnel proxy that help you get through firewalls", description="A fast tunnel proxy that help you get through firewalls",
author='clowwindy', author='clowwindy',

4
shadowsocks/asyncdns.py
View file

@ -232,7 +232,7 @@ def is_ip(address):
for family in (socket.AF_INET, socket.AF_INET6): for family in (socket.AF_INET, socket.AF_INET6):
try: try:
socket.inet_pton(family, address) socket.inet_pton(family, address)
return True return family
except (TypeError, ValueError, OSError, IOError): except (TypeError, ValueError, OSError, IOError):
pass pass
return False return False
@ -289,7 +289,7 @@ class DNSResolver(object):
parts = line.split() parts = line.split()
if len(parts) >= 2: if len(parts) >= 2:
server = parts[1] server = parts[1]
if is_ip(server): if is_ip(server) == socket.AF_INET:
self._servers.append(server) self._servers.append(server)
except IOError: except IOError:
pass pass