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

n

Browse source
This commit is contained in:
JinXing 2014-04-15 20:57:29 +08:00
parent 926aa7e273
commit b78d98c3a2
1 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
shadowsocks/server-epoll.py
View file

@ -202,16 +202,16 @@ class LeftTunnelHandler(BaseTunnelHandler):
return None return None
port = struct.unpack('>H', self.decrypt(rfile.read(2)))[0] port = struct.unpack('>H', self.decrypt(rfile.read(2)))[0]
try: try:
logging.info('connecting to remote %s:%d', addr, port)
_start_time = time.time() _start_time = time.time()
# remote_socket = socket.create_connection((addr, port), G_CONFIG['timeout']) # remote_socket = socket.create_connection((addr, port), G_CONFIG['timeout'])
remote_socket = socket.socket() remote_socket = socket.socket()
remote_socket.connect((addr, port)) remote_socket.connect((addr, port))
remote_socket.setblocking(0) remote_socket.setblocking(0)
logging.info('connecting to remote %s:%d, use time: %d', logging.info('cost time: %d', time.time()-_start_time)
addr, port, time.time()-_start_time)
except socket.error, e: except socket.error, e:
# Connection refused # Connection refused
logging.warn(e) logging.warn("connect_to_remote(): %s, args: %r", e, e.args)
return None return None
remote_ts = TunnelStream(remote_socket) remote_ts = TunnelStream(remote_socket)
@ -277,7 +277,6 @@ def main():
PORTPASSWORD = config.get('port_password') PORTPASSWORD = config.get('port_password')
config['timeout'] = config.get('timeout', 600) config['timeout'] = config.get('timeout', 600)
TIMEOUT = config.get('timeout')
if not KEY and not config_path: if not KEY and not config_path:
sys.exit('config not specified, please read https://github.com/clowwindy/shadowsocks') sys.exit('config not specified, please read https://github.com/clowwindy/shadowsocks')
@ -296,16 +295,6 @@ def main():
encrypt.init_table(KEY, METHOD) 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() io = ioloop.IOLoop()
import socket import socket
sock = socket.socket() sock = socket.socket()