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

add tunnel_udp_server.close to local.py and tunnel.py

Browse source
This commit is contained in:
Falseen 2017-02-17 01:54:57 +08:00
parent aa0d90f1be
commit 4d5f14986a
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/local.py
View file

@ -51,14 +51,18 @@ def main():
dns_resolver.add_to_loop(loop) dns_resolver.add_to_loop(loop)
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
if config["dns_service"]: if config["dns_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)
has_tunnel = True
def handler(signum, _): def handler(signum, _):
logging.warn('received SIGQUIT, doing graceful shutting down..') logging.warn('received SIGQUIT, doing graceful shutting down..')
tcp_server.close(next_tick=True) tcp_server.close(next_tick=True)
udp_server.close(next_tick=True) udp_server.close(next_tick=True)
if has_tunnel:
tunnel_udp_server.close(next_tick=True)
signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler) signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler)
def int_handler(signum, _): def int_handler(signum, _):

2
shadowsocks/tunnel.py
View file

@ -63,7 +63,7 @@ def main():
def handler(signum, _): def handler(signum, _):
logging.warn('received SIGQUIT, doing graceful shutting down..') logging.warn('received SIGQUIT, doing graceful shutting down..')
#tcp_server.close(next_tick=True) #tcp_server.close(next_tick=True)
udp_server.close(next_tick=True) tunnel_udp_server.close(next_tick=True)
signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler) signal.signal(getattr(signal, 'SIGQUIT', signal.SIGTERM), handler)
def int_handler(signum, _): def int_handler(signum, _):