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

add "protocol_param"

Browse source
This commit is contained in:
BreakWa11 2015-12-23 18:19:57 +08:00
parent 42a05d22d6
commit 519c84719f
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shadowsocks/server.py
View file

@ -74,9 +74,12 @@ def main():
if type(password_obfs) == list: if type(password_obfs) == list:
password = password_obfs[0] password = password_obfs[0]
obfs = password_obfs[1] obfs = password_obfs[1]
if len(password_obfs) >= 2:
protocol = password_obfs[2]
elif type(password_obfs) == dict: elif type(password_obfs) == dict:
password = password_obfs.get('password', 'm') password = password_obfs.get('password', 'm')
protocol = password_obfs.get('protocol', 'origin') protocol = password_obfs.get('protocol', 'origin')
protocol_param = password_obfs.get('protocol_param', '')
obfs = password_obfs.get('obfs', 'plain') obfs = password_obfs.get('obfs', 'plain')
obfs_param = password_obfs.get('obfs_param', '') obfs_param = password_obfs.get('obfs_param', '')
else: else: