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

Disable forbidden ip feature for local shadowsocks

Browse source 
Since forbidden ip is server-side only, disable it for local-side.
This commit also supress warning about IPv6 loopback because I can
confirm ::1/128 is the only loopback address, not like IPv4.
This commit is contained in:
Sunny 2015-02-01 00:48:15 +08:00
parent b11d848986
commit 070108f78b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shadowsocks/utils.py
View file

@ -186,7 +186,6 @@ def get_config(is_local):
config['verbose'] = config.get('verbose', False)
config['local_address'] = config.get('local_address', '127.0.0.1')
config['local_port'] = config.get('local_port', 1080)
config['forbidden_ip'] = IPNetwork(config.get('forbidden_ip', '127.0.0.0/8,::1'))
if is_local:
if config.get('server', None) is None:
logging.error('server addr not specified')
@ -194,6 +193,8 @@ def get_config(is_local):
sys.exit(2)
else:
config['server'] = config.get('server', '0.0.0.0')
config['forbidden_ip'] = \
IPNetwork(config.get('forbidden_ip', '127.0.0.0/8,::1/128'))
config['server_port'] = config.get('server_port', 8388)
if is_local and not config.get('password', None):