From 7b0e01722a23fdf9e48acebfb7d96a6973637e82 Mon Sep 17 00:00:00 2001 From: mengskysama Date: Tue, 30 Sep 2014 12:16:45 +0800 Subject: [PATCH] disable udp normal --- shadowsocks/server_pool.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/shadowsocks/server_pool.py b/shadowsocks/server_pool.py index 31f54bd..ab22d56 100644 --- a/shadowsocks/server_pool.py +++ b/shadowsocks/server_pool.py @@ -48,8 +48,8 @@ class ServerPool(object): self.mgr = asyncmgr.ServerMgr() self.tcp_servers_pool = {} self.tcp_ipv6_servers_pool = {} - self.udp_servers_pool = {} - self.udp_ipv6_servers_pool = {} + #self.udp_servers_pool = {} + #self.udp_ipv6_servers_pool = {} self.loop = eventloop.EventLoop() thread.start_new_thread(ServerPool._loop, (self.loop, self.dns_resolver, self.mgr)) @@ -107,9 +107,9 @@ class ServerPool(object): tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False) tcp_server.add_to_loop(self.loop) self.tcp_servers_pool.update({port: tcp_server}) - udp_server = udprelay.UDPRelay(a_config, self.dns_resolver, False) - udp_server.add_to_loop(self.loop) - self.udp_servers_pool.update({port: udp_server}) + #udp_server = udprelay.UDPRelay(a_config, self.dns_resolver, False) + #udp_server.add_to_loop(self.loop) + #self.udp_servers_pool.update({port: udp_server}) except Exception, e: logging.warn(e) @@ -127,9 +127,9 @@ class ServerPool(object): tcp_server = tcprelay.TCPRelay(a_config, self.dns_resolver, False) tcp_server.add_to_loop(self.loop) self.tcp_ipv6_servers_pool.update({port: tcp_server}) - udp_server = udprelay.UDPRelay(a_config, self.dns_resolver, False) - udp_server.add_to_loop(self.loop) - self.udp_ipv6_servers_pool.update({port: udp_server}) + #udp_server = udprelay.UDPRelay(a_config, self.dns_resolver, False) + #udp_server.add_to_loop(self.loop) + #self.udp_ipv6_servers_pool.update({port: udp_server}) except Exception, e: logging.warn(e) return True @@ -155,8 +155,8 @@ class ServerPool(object): try: self.tcp_servers_pool[port].destroy() del self.tcp_servers_pool[port] - self.udp_servers_pool[port].destroy() - del self.udp_servers_pool[port] + #self.udp_servers_pool[port].destroy() + #del self.udp_servers_pool[port] except Exception, e: logging.warn(e) @@ -167,8 +167,8 @@ class ServerPool(object): try: self.tcp_ipv6_servers_pool[port].destroy() del self.tcp_ipv6_servers_pool[port] - self.udp_ipv6_servers_pool[port].destroy() - del self.udp_ipv6_servers_pool[port] + #self.udp_ipv6_servers_pool[port].destroy() + #del self.udp_ipv6_servers_pool[port] except Exception, e: logging.warn(e)