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

-P => -O

Browse source
This commit is contained in:
破娃酱 2016-10-08 11:21:30 +08:00
parent 1183d567c9
commit d1f64de6b4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shadowsocks/shell.py
View file

@ -136,11 +136,11 @@ def get_config(is_local):
logging.basicConfig(level=logging.INFO, logging.basicConfig(level=logging.INFO,
format='%(levelname)-s: %(message)s') format='%(levelname)-s: %(message)s')
if is_local: if is_local:
shortopts = 'hd:s:b:p:k:l:m:P:o:G:g:c:t:vq' shortopts = 'hd:s:b:p:k:l:m:O:o:G:g:c:t:vq'
longopts = ['help', 'fast-open', 'pid-file=', 'log-file=', 'user=', longopts = ['help', 'fast-open', 'pid-file=', 'log-file=', 'user=',
'version'] 'version']
else: else:
shortopts = 'hd:s:p:k:m:P:o:G:g:c:t:vq' shortopts = 'hd:s:p:k:m:O:o:G:g:c:t:vq'
longopts = ['help', 'fast-open', 'pid-file=', 'log-file=', 'workers=', longopts = ['help', 'fast-open', 'pid-file=', 'log-file=', 'workers=',
'forbidden-ip=', 'user=', 'manager-address=', 'version'] 'forbidden-ip=', 'user=', 'manager-address=', 'version']
try: try:
@ -174,7 +174,7 @@ def get_config(is_local):
config['server'] = to_str(value) config['server'] = to_str(value)
elif key == '-m': elif key == '-m':
config['method'] = to_str(value) config['method'] = to_str(value)
elif key == '-P': elif key == '-O':
config['protocol'] = to_str(value) config['protocol'] = to_str(value)
elif key == '-o': elif key == '-o':
config['obfs'] = to_str(value) config['obfs'] = to_str(value)