From 519c84719fb9017de504db677b9c9cb9bb586654 Mon Sep 17 00:00:00 2001 From: BreakWa11 Date: Wed, 23 Dec 2015 18:19:57 +0800 Subject: [PATCH] add "protocol_param" --- shadowsocks/server.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shadowsocks/server.py b/shadowsocks/server.py index c0b6ed8..f672de9 100755 --- a/shadowsocks/server.py +++ b/shadowsocks/server.py @@ -74,9 +74,12 @@ def main(): if type(password_obfs) == list: password = password_obfs[0] obfs = password_obfs[1] + if len(password_obfs) >= 2: + protocol = password_obfs[2] elif type(password_obfs) == dict: password = password_obfs.get('password', 'm') protocol = password_obfs.get('protocol', 'origin') + protocol_param = password_obfs.get('protocol_param', '') obfs = password_obfs.get('obfs', 'plain') obfs_param = password_obfs.get('obfs_param', '') else: