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

load 'user-config.json' first

Browse source 
set default obfs plugin 'tls1.0_session_auth_compatible'
This commit is contained in:
BreakWa11 2015-12-19 15:45:17 +08:00
parent 459b0c7004
commit 68a77ddc70
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.json
View file

@ -9,7 +9,7 @@
"method": "aes-256-cfb", "method": "aes-256-cfb",
"protocol": "auth_sha1_compatible", "protocol": "auth_sha1_compatible",
"protocol_param": "", "protocol_param": "",
"obfs": "http_simple_compatible", "obfs": "tls1.0_session_auth_compatible",
"obfs_param": "", "obfs_param": "",
"redirect": "", "redirect": "",
"dns_ipv6": false, "dns_ipv6": false,

8
shadowsocks/shell.py
View file

@ -62,8 +62,14 @@ def print_shadowsocks():
pass pass
print('Shadowsocks %s' % version) print('Shadowsocks %s' % version)
def find_config(): def find_config():
config_path = 'user-config.json'
if os.path.exists(config_path):
return config_path
config_path = os.path.join(os.path.dirname(__file__), '../', 'user-config.json')
if os.path.exists(config_path):
return config_path
config_path = 'config.json' config_path = 'config.json'
if os.path.exists(config_path): if os.path.exists(config_path):
return config_path return config_path