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

Fix udp dns issue under python3 (#849)

Browse source 
str is not bytes under python3, if dns config is a list, will cause asyncdns.py failed:

asyncdns.py:
..........
    def handle_event(self, sock, fd, event):
        if sock != self._sock:
            return
        if event & eventloop.POLL_ERR:
       ...........
        else:
            data, addr = sock.recvfrom(1024)
            if addr[0] not in self._servers:
                logging.warn('received a packet other than our dns')
                return
            self._handle_data(data)
This commit is contained in:
Zou Yong 2017-05-12 03:06:38 -05:00 • committed by mengskysama
parent 06b028b5c0
commit 13b5d6e5ec
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/shell.py
View file

@ -199,6 +199,8 @@ def check_config(config, is_local):
if config.get('dns_server', None) is not None: if config.get('dns_server', None) is not None:
if type(config['dns_server']) != list: if type(config['dns_server']) != list:
config['dns_server'] = to_str(config['dns_server']) config['dns_server'] = to_str(config['dns_server'])
else:
config['dns_server'] = [to_str(ds) for ds in config['dns_server']]
logging.info('Specified DNS server: %s' % config['dns_server']) logging.info('Specified DNS server: %s' % config['dns_server'])
config['crypto_path'] = {'openssl': config['libopenssl'], config['crypto_path'] = {'openssl': config['libopenssl'],