From b606e19c0bd284b388a148d87a647665aca97df8 Mon Sep 17 00:00:00 2001 From: BreakWa11 Date: Mon, 2 Nov 2015 19:42:45 +0800 Subject: [PATCH] fix default protocol setting --- shadowsocks/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shadowsocks/server.py b/shadowsocks/server.py index 651f209..4c19474 100755 --- a/shadowsocks/server.py +++ b/shadowsocks/server.py @@ -68,8 +68,8 @@ def main(): port_password = config['port_password'] del config['port_password'] for port, password_obfs in port_password.items(): - protocol = 'origin' - obfs_param = '' + protocol = config.get("protocol", 'origin') + obfs_param = config.get("obfs_param", '') if type(password_obfs) == list: password = password_obfs[0] obfs = password_obfs[1]