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

多端口模式下支持每个端口定义不同的混淆协议

Browse source 
增加：多端口模式下支持每个端口定义不同的混淆协议
This commit is contained in:
falseen 2015-09-30 01:01:19 +08:00
parent 74972875ff
commit 96a9a25eaa
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
shadowsocks/server.py
View file

@ -59,16 +59,23 @@ def main():
dns_resolver = asyncdns.DNSResolver() dns_resolver = asyncdns.DNSResolver()
port_password = config['port_password'] port_password = config['port_password']
del config['port_password'] del config['port_password']
for port, password in port_password.items(): for port, password_obfs in port_password.items():
if type(password_obfs) == list:
password = password_obfs[0]
obfs = password_obfs[1]
else:
password = password_obfs
obfs = config["obfs"]
a_config = config.copy() a_config = config.copy()
ipv6_ok = False ipv6_ok = False
logging.info("server start with password [%s] method [%s]" % (password, a_config['method'])) logging.info("server start with password [%s] obfs [%s] method [%s]" % (password, obfs, a_config['method']))
if 'server_ipv6' in a_config: if 'server_ipv6' in a_config:
try: try:
if len(a_config['server_ipv6']) > 2 and a_config['server_ipv6'][0] == "[" and a_config['server_ipv6'][-1] == "]": if len(a_config['server_ipv6']) > 2 and a_config['server_ipv6'][0] == "[" and a_config['server_ipv6'][-1] == "]":
a_config['server_ipv6'] = a_config['server_ipv6'][1:-1] a_config['server_ipv6'] = a_config['server_ipv6'][1:-1]
a_config['server_port'] = int(port) a_config['server_port'] = int(port)
a_config['password'] = password a_config['password'] = password
a_config['obfs'] = obfs
a_config['server'] = a_config['server_ipv6'] a_config['server'] = a_config['server_ipv6']
logging.info("starting server at %s:%d" % logging.info("starting server at %s:%d" %
(a_config['server'], int(port))) (a_config['server'], int(port)))
@ -83,6 +90,7 @@ def main():
a_config = config.copy() a_config = config.copy()
a_config['server_port'] = int(port) a_config['server_port'] = int(port)
a_config['password'] = password a_config['password'] = password
a_config['obfs'] = obfs
logging.info("starting server at %s:%d" % logging.info("starting server at %s:%d" %
(a_config['server'], int(port))) (a_config['server'], int(port)))
tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False)) tcp_servers.append(tcprelay.TCPRelay(a_config, dns_resolver, False))