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

more log for debug

Browse source
This commit is contained in:
破娃酱 2017-05-09 20:02:24 +08:00
parent 8aa3fcd207
commit 7599e53a6f
1 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
shadowsocks/tcprelay.py
View file

@ -147,7 +147,6 @@ class TCPRelayHandler(object):
# TCP Relay works as either sslocal or ssserver # TCP Relay works as either sslocal or ssserver
# if is_local, this is sslocal # if is_local, this is sslocal
self._is_local = is_local self._is_local = is_local
self._stage = STAGE_INIT
self._encrypt_correct = True self._encrypt_correct = True
self._obfs = obfs.obfs(config['obfs']) self._obfs = obfs.obfs(config['obfs'])
self._protocol = obfs.obfs(config['protocol']) self._protocol = obfs.obfs(config['protocol'])
@ -211,11 +210,6 @@ class TCPRelayHandler(object):
if is_local: if is_local:
self._chosen_server = self._get_a_server() self._chosen_server = self._get_a_server()
fd_to_handlers[local_sock.fileno()] = self
local_sock.setblocking(False)
local_sock.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
loop.add(local_sock, eventloop.POLL_IN | eventloop.POLL_ERR, self._server)
self.last_activity = 0 self.last_activity = 0
self._update_activity() self._update_activity()
self._server.add_connection(1) self._server.add_connection(1)
@ -226,6 +220,12 @@ class TCPRelayHandler(object):
self._udp_send_pack_id = 0 self._udp_send_pack_id = 0
self._udpv6_send_pack_id = 0 self._udpv6_send_pack_id = 0
local_sock.setblocking(False)
local_sock.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
fd_to_handlers[local_sock.fileno()] = self
loop.add(local_sock, eventloop.POLL_IN | eventloop.POLL_ERR, self._server)
self._stage = STAGE_INIT
def __hash__(self): def __hash__(self):
# default __hash__ is id / 16 # default __hash__ is id / 16
# we want to eliminate collisions # we want to eliminate collisions
@ -311,7 +311,6 @@ class TCPRelayHandler(object):
# and update the stream to wait for writing # and update the stream to wait for writing
if not sock: if not sock:
return False return False
#logging.debug("_write_to_sock %s %s %s" % (self._remote_sock, sock, self._remote_udp))
uncomplete = False uncomplete = False
if self._remote_udp and sock == self._remote_sock: if self._remote_udp and sock == self._remote_sock:
try: try:
@ -832,7 +831,15 @@ class TCPRelayHandler(object):
return return
if obfs_decode[2]: if obfs_decode[2]:
data = self._obfs.server_encode(b'') data = self._obfs.server_encode(b'')
self._write_to_sock(data, self._local_sock) try:
self._write_to_sock(data, self._local_sock)
except Exception as e:
shell.print_exception(e)
if self._config['verbose']:
traceback.print_exc()
logging.error("exception from %s:%d" % (self._client_address[0], self._client_address[1]))
self.destroy()
return
if obfs_decode[1]: if obfs_decode[1]:
if not self._protocol.obfs.server_info.recv_iv: if not self._protocol.obfs.server_info.recv_iv:
iv_len = len(self._protocol.obfs.server_info.iv) iv_len = len(self._protocol.obfs.server_info.iv)
@ -859,6 +866,7 @@ class TCPRelayHandler(object):
shell.print_exception(e) shell.print_exception(e)
logging.error("exception from %s:%d" % (self._client_address[0], self._client_address[1])) logging.error("exception from %s:%d" % (self._client_address[0], self._client_address[1]))
self.destroy() self.destroy()
return
else: else:
return return
if not data: if not data:
@ -870,12 +878,10 @@ class TCPRelayHandler(object):
data = self._encryptor.encrypt(data) data = self._encryptor.encrypt(data)
data = self._obfs.client_encode(data) data = self._obfs.client_encode(data)
self._write_to_sock(data, self._remote_sock) self._write_to_sock(data, self._remote_sock)
return
elif is_local and self._stage == STAGE_INIT: elif is_local and self._stage == STAGE_INIT:
# TODO check auth method # TODO check auth method
self._write_to_sock(b'\x05\00', self._local_sock) self._write_to_sock(b'\x05\00', self._local_sock)
self._stage = STAGE_ADDR self._stage = STAGE_ADDR
return
elif self._stage == STAGE_CONNECTING: elif self._stage == STAGE_CONNECTING:
self._handle_stage_connecting(data) self._handle_stage_connecting(data)
elif (is_local and self._stage == STAGE_ADDR) or \ elif (is_local and self._stage == STAGE_ADDR) or \
@ -1016,36 +1022,34 @@ class TCPRelayHandler(object):
if event & eventloop.POLL_ERR: if event & eventloop.POLL_ERR:
handle = True handle = True
self._on_remote_error() self._on_remote_error()
if self._stage == STAGE_DESTROYED: elif event & (eventloop.POLL_IN | eventloop.POLL_HUP):
return True
if event & (eventloop.POLL_IN | eventloop.POLL_HUP):
if not self.speed_tester_d.isExceed(): if not self.speed_tester_d.isExceed():
if not self._server.speed_tester_d(self._user_id).isExceed(): if not self._server.speed_tester_d(self._user_id).isExceed():
handle = True handle = True
self._on_remote_read(sock == self._remote_sock) self._on_remote_read(sock == self._remote_sock)
if self._stage == STAGE_DESTROYED: elif event & eventloop.POLL_OUT:
return True
if event & eventloop.POLL_OUT:
handle = True handle = True
self._on_remote_write() self._on_remote_write()
elif sock == self._local_sock: elif sock == self._local_sock:
if event & eventloop.POLL_ERR: if event & eventloop.POLL_ERR:
handle = True handle = True
self._on_local_error() self._on_local_error()
if self._stage == STAGE_DESTROYED: elif event & (eventloop.POLL_IN | eventloop.POLL_HUP):
return True
if event & (eventloop.POLL_IN | eventloop.POLL_HUP):
if not self.speed_tester_u.isExceed(): if not self.speed_tester_u.isExceed():
if not self._server.speed_tester_u(self._user_id).isExceed(): if not self._server.speed_tester_u(self._user_id).isExceed():
handle = True handle = True
self._on_local_read() self._on_local_read()
if self._stage == STAGE_DESTROYED: elif event & eventloop.POLL_OUT:
return True
if event & eventloop.POLL_OUT:
handle = True handle = True
self._on_local_write() self._on_local_write()
else: else:
logging.warn('unknown socket from %s:%d' % (self._client_address[0], self._client_address[1])) logging.warn('unknown socket from %s:%d' % (self._client_address[0], self._client_address[1]))
try:
self._loop.remove(sock)
except Exception as e:
shell.print_exception(e)
del self._fd_to_handlers[sock.fileno()]
sock.close()
return handle return handle
@ -1079,16 +1083,16 @@ class TCPRelayHandler(object):
try: try:
self._loop.remove(self._remote_sock) self._loop.remove(self._remote_sock)
except Exception as e: except Exception as e:
pass shell.print_exception(e)
del self._fd_to_handlers[self._remote_sock.fileno()] del self._fd_to_handlers[self._remote_sock.fileno()]
self._remote_sock.close() self._remote_sock.close()
self._remote_sock = None self._remote_sock = None
if self._remote_sock_v6: if self._remote_sock_v6:
logging.debug('destroying remote') logging.debug('destroying remote_v6')
try: try:
self._loop.remove(self._remote_sock_v6) self._loop.remove(self._remote_sock_v6)
except Exception as e: except Exception as e:
pass shell.print_exception(e)
del self._fd_to_handlers[self._remote_sock_v6.fileno()] del self._fd_to_handlers[self._remote_sock_v6.fileno()]
self._remote_sock_v6.close() self._remote_sock_v6.close()
self._remote_sock_v6 = None self._remote_sock_v6 = None
@ -1334,6 +1338,7 @@ class TCPRelay(object):
if event & eventloop.POLL_ERR: if event & eventloop.POLL_ERR:
# TODO # TODO
raise Exception('server_socket error') raise Exception('server_socket error')
handler = None
try: try:
logging.debug('accept') logging.debug('accept')
conn = self._server_socket.accept() conn = self._server_socket.accept()
@ -1351,11 +1356,15 @@ class TCPRelay(object):
shell.print_exception(e) shell.print_exception(e)
if self._config['verbose']: if self._config['verbose']:
traceback.print_exc() traceback.print_exc()
if handler:
handler.destroy()
else: else:
if sock: if sock:
handler = self._fd_to_handlers.get(fd, None) handler = self._fd_to_handlers.get(fd, None)
if handler: if handler:
handler.handle_event(sock, event) handler.handle_event(sock, event)
else:
logging.warn('unknown fd')
else: else:
logging.warn('poll removed fd') logging.warn('poll removed fd')