From b78d98c3a26b641424a2acaad5611e8087c915f6 Mon Sep 17 00:00:00 2001 From: JinXing Date: Tue, 15 Apr 2014 20:57:29 +0800 Subject: [PATCH] n --- shadowsocks/server-epoll.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/shadowsocks/server-epoll.py b/shadowsocks/server-epoll.py index 518b363..270e659 100644 --- a/shadowsocks/server-epoll.py +++ b/shadowsocks/server-epoll.py @@ -202,16 +202,16 @@ class LeftTunnelHandler(BaseTunnelHandler): return None port = struct.unpack('>H', self.decrypt(rfile.read(2)))[0] try: + logging.info('connecting to remote %s:%d', addr, port) _start_time = time.time() # remote_socket = socket.create_connection((addr, port), G_CONFIG['timeout']) remote_socket = socket.socket() remote_socket.connect((addr, port)) remote_socket.setblocking(0) - logging.info('connecting to remote %s:%d, use time: %d', - addr, port, time.time()-_start_time) + logging.info('cost time: %d', time.time()-_start_time) except socket.error, e: # Connection refused - logging.warn(e) + logging.warn("connect_to_remote(): %s, args: %r", e, e.args) return None remote_ts = TunnelStream(remote_socket) @@ -277,7 +277,6 @@ def main(): PORTPASSWORD = config.get('port_password') config['timeout'] = config.get('timeout', 600) - TIMEOUT = config.get('timeout') if not KEY and not config_path: sys.exit('config not specified, please read https://github.com/clowwindy/shadowsocks') @@ -296,16 +295,6 @@ def main(): encrypt.init_table(KEY, METHOD) - """ - if IPv6: - ThreadingTCPServer.address_family = socket.AF_INET6 - for port, key in PORTPASSWORD.items(): - server = ThreadingTCPServer((SERVER, int(port)), Socks5Server) - server.key, server.method, server.timeout = key, METHOD, int(TIMEOUT) - logging.info("starting server at %s:%d" % tuple(server.server_address[:2])) - threading.Thread(target=server.serve_forever).start() - """ - io = ioloop.IOLoop() import socket sock = socket.socket()