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

better error message

Browse source
This commit is contained in:
clowwindy 2013-06-22 17:56:30 +08:00
parent 7fc0cd86f9
commit 825747c530
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/local.py
View file

@ -163,6 +163,7 @@ def main():
pass
print 'shadowsocks %s' % version
KEY = None
METHOD = None
LOCAL = ''
IPv6 = False
@ -201,6 +202,9 @@ def main():
elif key == '-6':
IPv6 = True
if not KEY and not config_path:
sys.exit('config not specified, please read https://github.com/clowwindy/shadowsocks')
encrypt.init_table(KEY, METHOD)
try:

8
shadowsocks/server.py
View file

@ -139,6 +139,7 @@ def main():
pass
print 'shadowsocks %s' % version
KEY = None
METHOD = None
IPv6 = False
@ -147,10 +148,10 @@ def main():
for key, value in optlist:
if key == '-c':
config_path = value
with open('config.json', 'rb') as f:
config = json.load(f)
if config_path:
with open('config.json', 'rb') as f:
config = json.load(f)
logging.info('loading config from %s' % config_path)
SERVER = config['server']
PORT = config['server_port']
@ -168,6 +169,9 @@ def main():
elif key == '-6':
IPv6 = True
if not KEY and not config_path:
sys.exit('config not specified, please read https://github.com/clowwindy/shadowsocks')
encrypt.init_table(KEY, METHOD)
if IPv6:
ThreadingTCPServer.address_family = socket.AF_INET6