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

add control manager

Browse source
This commit is contained in:
clowwindy 2015-08-05 18:12:38 +08:00
parent 58df1d82d0
commit 956199efcd
5 changed files with 170 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shadowsocks/server.py
View file

@ -24,7 +24,8 @@ import logging
import signal
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '../'))
from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, asyncdns
from shadowsocks import shell, daemon, eventloop, tcprelay, udprelay, \
asyncdns, manager
def main():
@ -48,10 +49,17 @@ def main():
else:
config['port_password'][str(server_port)] = config['password']
if config['manager_port']:
logging.info('entering manager mode')
manager.run(config)
return
tcp_servers = []
udp_servers = []
dns_resolver = asyncdns.DNSResolver()
for port, password in config['port_password'].items():
port_password = config['port_password']
del config['port_password']
for port, password in port_password.items():
a_config = config.copy()
a_config['server_port'] = int(port)
a_config['password'] = password