From 9e25cc6bb44836f39eabd25e677b066a8551972f Mon Sep 17 00:00:00 2001 From: Falseen Date: Sun, 19 Mar 2017 12:37:57 +0800 Subject: [PATCH] fix some error for parse dns_servre in config (#798) and fix pep8 https://github.com/shadowsocks/shadowsocks/pull/739 --- config.json.example | 1 + shadowsocks/shell.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.json.example b/config.json.example index 4006656..2cee3b8 100644 --- a/config.json.example +++ b/config.json.example @@ -7,6 +7,7 @@ "method":"aes-256-cfb", "local_address":"127.0.0.1", "fast_open":false, + "dns_server":["8.8.8.8", 8.8.4.4], "tunnel_remote":"8.8.8.8", "tunnel_remote_port":53, "tunnel_port":53 diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py index 1a7322c..af33456 100644 --- a/shadowsocks/shell.py +++ b/shadowsocks/shell.py @@ -167,8 +167,7 @@ def check_config(config, is_local): config['server_port'] = int(config['server_port']) if 'tunnel_remote_port' in config: - config['tunnel_remote_port'] = \ - int(config['tunnel_remote_port']) + config['tunnel_remote_port'] = int(config['tunnel_remote_port']) if 'tunnel_port' in config: config['tunnel_port'] = int(config['tunnel_port']) @@ -198,6 +197,8 @@ def check_config(config, is_local): logging.error('user can be used only on Unix') sys.exit(1) if config.get('dns_server', None) is not None: + if type(config['dns_server']) != list: + config['dns_server'] = to_str(config['dns_server']) logging.info('Specified DNS server: %s' % config['dns_server']) cryptor.try_cipher(config['password'], config['method']) @@ -313,8 +314,7 @@ def get_config(is_local): config['prefer_ipv6'] = config.get('prefer_ipv6', False) config['server_port'] = config.get('server_port', 8388) - config['tunnel_remote'] = \ - to_str(config.get('tunnel_remote', '8.8.8.8')) + config['tunnel_remote'] = to_str(config.get('tunnel_remote', '8.8.8.8')) config['tunnel_remote_port'] = config.get('tunnel_remote_port', 53) config['tunnel_port'] = config.get('tunnel_port', 53) config['dns_server'] = config.get('dns_server', None)