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

fix tunnel for run tunnel alone

Browse source
This commit is contained in:
Falseen 2017-02-17 03:16:52 +08:00
parent 6f57db82c2
commit 044354779a
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
shadowsocks/local.py
View file

@ -52,6 +52,7 @@ def main():
tcp_server.add_to_loop(loop) tcp_server.add_to_loop(loop)
udp_server.add_to_loop(loop) udp_server.add_to_loop(loop)
has_tunnel = False has_tunnel = False
# if tunnel_service is True then run tunnel_udp_server
if config["tunnel_service"]: if config["tunnel_service"]:
tunnel_udp_server = get_tunnel_udp_server(config.copy(), dns_resolver) tunnel_udp_server = get_tunnel_udp_server(config.copy(), dns_resolver)
tunnel_udp_server.add_to_loop(loop) tunnel_udp_server.add_to_loop(loop)

2
shadowsocks/tunnel.py
View file

@ -55,6 +55,8 @@ def main():
config = shell.get_config(True) config = shell.get_config(True)
daemon.daemon_exec(config) daemon.daemon_exec(config)
dns_resolver = asyncdns.DNSResolver() dns_resolver = asyncdns.DNSResolver()
# if running tunnel then update tunnel_service to True
config["tunnel_service"] = True
tunnel_udp_server = get_tunnel_udp_server(config, dns_resolver) tunnel_udp_server = get_tunnel_udp_server(config, dns_resolver)
loop = eventloop.EventLoop() loop = eventloop.EventLoop()
dns_resolver.add_to_loop(loop) dns_resolver.add_to_loop(loop)