From 569ca0d0a43839d6ae521ae0aeb275fe7599b8bb Mon Sep 17 00:00:00 2001 From: jsy Date: Mon, 11 Jan 2016 18:30:45 +0800 Subject: [PATCH] reverse config --- shadowsocks/server.py | 13 ++++++------- shadowsocks/shell.py | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/shadowsocks/server.py b/shadowsocks/server.py index 5896c7d..1be4c0f 100755 --- a/shadowsocks/server.py +++ b/shadowsocks/server.py @@ -42,13 +42,12 @@ def main(): 'will be ignored') else: config['port_password'] = {} - server_port = config.get('server_port', None) - if server_port: - if type(server_port) == list: - for a_server_port in server_port: - config['port_password'][a_server_port] = config['password'] - else: - config['port_password'][str(server_port)] = config['password'] + server_port = config['server_port'] + if type(server_port) == list: + for a_server_port in server_port: + config['port_password'][a_server_port] = config['password'] + else: + config['port_password'][str(server_port)] = config['password'] if config.get('manager_address', 0): logging.info('entering manager mode') diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py index eb1dc04..67bfd92 100644 --- a/shadowsocks/shell.py +++ b/shadowsocks/shell.py @@ -93,7 +93,7 @@ def check_config(config, is_local): if 'local_port' in config: config['local_port'] = int(config['local_port']) - if config.get('server_port', None) and type(config['server_port']) != list: + if 'server_port' in config and type(config['server_port']) != list: config['server_port'] = int(config['server_port']) if config.get('local_address', '') in [b'0.0.0.0']: @@ -243,7 +243,7 @@ def get_config(is_local): except Exception as e: logging.error(e) sys.exit(2) - config['server_port'] = config.get('server_port', None) + config['server_port'] = config.get('server_port', 8388) logging.getLogger('').handlers = [] logging.addLevelName(VERBOSE_LEVEL, 'VERBOSE')