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

Merge bf01f6cc01 into e332ec93e9

Browse source
This commit is contained in:
LI欣欣zn 2018-02-19 02:43:46 +00:00 • committed by GitHub
commit fe9b466425
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
shadowsocks/server.py
View file

@ -42,12 +42,13 @@ def main():
'will be ignored') 'will be ignored')
else: else:
config['port_password'] = {} config['port_password'] = {}
server_port = config['server_port'] server_port = config.get('server_port', None)
if type(server_port) == list: if server_port:
for a_server_port in server_port: if type(server_port) == list:
config['port_password'][a_server_port] = config['password'] for a_server_port in server_port:
else: config['port_password'][a_server_port] = config['password']
config['port_password'][str(server_port)] = config['password'] else:
config['port_password'][str(server_port)] = config['password']
if config.get('manager_address', 0): if config.get('manager_address', 0):
logging.info('entering manager mode') logging.info('entering manager mode')

8
shadowsocks/shell.py
View file

@ -155,7 +155,7 @@ def check_config(config, is_local):
if not is_local and not config.get('password', None) \ if not is_local and not config.get('password', None) \
and not config.get('port_password', None) \ and not config.get('port_password', None) \
and not config.get('manager_address'): and not config.get('manager_address', None):
logging.error('password or port_password not specified') logging.error('password or port_password not specified')
print_help(is_local) print_help(is_local)
sys.exit(2) sys.exit(2)
@ -163,8 +163,8 @@ def check_config(config, is_local):
if 'local_port' in config: if 'local_port' in config:
config['local_port'] = int(config['local_port']) config['local_port'] = int(config['local_port'])
if 'server_port' in config and type(config['server_port']) != list: if not config.get('server_port',None) and not config.get('manager_address', None):
config['server_port'] = int(config['server_port']) config['server_port'] = int(8388)
if 'tunnel_remote_port' in config: if 'tunnel_remote_port' in config:
config['tunnel_remote_port'] = int(config['tunnel_remote_port']) config['tunnel_remote_port'] = int(config['tunnel_remote_port'])
@ -325,7 +325,7 @@ def get_config(is_local):
config['local_port'] = config.get('local_port', 1080) config['local_port'] = config.get('local_port', 1080)
config['one_time_auth'] = config.get('one_time_auth', False) config['one_time_auth'] = config.get('one_time_auth', False)
config['prefer_ipv6'] = config.get('prefer_ipv6', False) config['prefer_ipv6'] = config.get('prefer_ipv6', False)
config['server_port'] = config.get('server_port', 8388) config['server_port'] = config.get('server_port', None)
config['dns_server'] = config.get('dns_server', None) config['dns_server'] = config.get('dns_server', None)
config['libopenssl'] = config.get('libopenssl', None) config['libopenssl'] = config.get('libopenssl', None)
config['libmbedtls'] = config.get('libmbedtls', None) config['libmbedtls'] = config.get('libmbedtls', None)