From b01dbb04344e88e0101b2525462deb8d3ce41a26 Mon Sep 17 00:00:00 2001 From: v3aqb Date: Tue, 12 Nov 2013 11:34:07 +0800 Subject: [PATCH] add default config when both config.json and args not provided --- shadowsocks/local.py | 8 +++++++- shadowsocks/server.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/shadowsocks/local.py b/shadowsocks/local.py index fd3d618..43455d9 100755 --- a/shadowsocks/local.py +++ b/shadowsocks/local.py @@ -179,7 +179,13 @@ def main(): with open(config_path, 'rb') as f: config = json.load(f) else: - config = {} + config = {"server": "127.0.0.1", + "server_port": 8388, + "local_port": 1080, + "password": "barfoo!", + "timeout": 600, + "method": "table" + } optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6') for key, value in optlist: diff --git a/shadowsocks/server.py b/shadowsocks/server.py index 8c6d07b..4e39fae 100755 --- a/shadowsocks/server.py +++ b/shadowsocks/server.py @@ -154,7 +154,13 @@ def main(): config = json.load(f) logging.info('loading config from %s' % config_path) else: - config = {} + config = {"server": "127.0.0.1", + "server_port": 8388, + "local_port": 1080, + "password": "barfoo!", + "timeout": 600, + "method": "table" + } optlist, args = getopt.getopt(sys.argv[1:], 's:p:k:m:c:6') for key, value in optlist: