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

Use IPNetwork supporting forbidden ip feature in config utils

Browse source 
This commit also make "forbidden_ip" field available in config file.
If no forbidden ip specified in command line and config file,
default to "127.0.0.0/8,::1".
This commit is contained in:
Sunny 2015-01-31 20:32:09 +08:00
parent 100ebcf064
commit 8af359ae05
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shadowsocks/utils.py
View file

@ -29,7 +29,7 @@ import json
import sys
import getopt
import logging
from shadowsocks.common import to_bytes, to_str
from shadowsocks.common import to_bytes, to_str, IPNetwork
VERBOSE_LEVEL = 5
@ -186,6 +186,7 @@ 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')