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

handle POLL_ERR first

Browse source
This commit is contained in:
clowwindy 2014-06-06 23:10:00 +08:00
parent 816592b674
commit d7d125082f
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
shadowsocks/tcprelay.py
View file

@ -364,11 +364,13 @@ class TCPRelayHandler(object):
def _on_local_error(self): def _on_local_error(self):
if self._local_sock: if self._local_sock:
logging.debug('got local error')
logging.error(eventloop.get_sock_error(self._local_sock)) logging.error(eventloop.get_sock_error(self._local_sock))
self.destroy() self.destroy()
def _on_remote_error(self): def _on_remote_error(self):
if self._remote_sock: if self._remote_sock:
logging.debug('got remote error')
logging.error(eventloop.get_sock_error(self._remote_sock)) logging.error(eventloop.get_sock_error(self._remote_sock))
self.destroy() self.destroy()
@ -377,23 +379,27 @@ class TCPRelayHandler(object):
return return
# order is important # order is important
if sock == self._remote_sock: if sock == self._remote_sock:
if event & eventloop.POLL_ERR:
self._on_remote_error()
if self._stage == STAGE_DESTROYED:
return
if event & eventloop.POLL_IN: if event & eventloop.POLL_IN:
self._on_remote_read() self._on_remote_read()
if self._stage == STAGE_DESTROYED: if self._stage == STAGE_DESTROYED:
return return
if event & eventloop.POLL_OUT: if event & eventloop.POLL_OUT:
self._on_remote_write() self._on_remote_write()
if event & eventloop.POLL_ERR:
self._on_remote_error()
elif sock == self._local_sock: elif sock == self._local_sock:
if event & eventloop.POLL_ERR:
self._on_local_error()
if self._stage == STAGE_DESTROYED:
return
if event & eventloop.POLL_IN: if event & eventloop.POLL_IN:
self._on_local_read() self._on_local_read()
if self._stage == STAGE_DESTROYED: if self._stage == STAGE_DESTROYED:
return return
if event & eventloop.POLL_OUT: if event & eventloop.POLL_OUT:
self._on_local_write() self._on_local_write()
if event & eventloop.POLL_ERR:
self._on_local_error()
else: else:
logging.warn('unknown socket') logging.warn('unknown socket')
@ -525,9 +531,9 @@ class TCPRelay(object):
def _handle_events(self, events): def _handle_events(self, events):
for sock, fd, event in events: for sock, fd, event in events:
# if sock: if sock:
# logging.debug('fd %d %s', fd, logging.debug('fd %d %s', fd,
# eventloop.EVENT_NAMES.get(event, event)) eventloop.EVENT_NAMES.get(event, event))
if sock == self._server_socket: if sock == self._server_socket:
if event & eventloop.POLL_ERR: if event & eventloop.POLL_ERR:
# TODO # TODO