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

fix default protocol setting

Browse source
This commit is contained in:
BreakWa11 2015-11-02 19:42:45 +08:00
parent bc419c4dc2
commit b606e19c0b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/server.py
View file

@ -68,8 +68,8 @@ def main():
port_password = config['port_password'] port_password = config['port_password']
del config['port_password'] del config['port_password']
for port, password_obfs in port_password.items(): for port, password_obfs in port_password.items():
protocol = 'origin' protocol = config.get("protocol", 'origin')
obfs_param = '' obfs_param = config.get("obfs_param", '')
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]