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

add timeout support in DNS; close #138

Browse source
This commit is contained in:
clowwindy 2014-07-04 21:57:11 +03:00
parent f4e68dc64e
commit b7bfdb9918
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shadowsocks/tcprelay.py
View file

@ -166,7 +166,8 @@ class TCPRelayHandler(object):
uncomplete = True uncomplete = True
except (OSError, IOError) as e: except (OSError, IOError) as e:
error_no = eventloop.errno_from_exception(e) error_no = eventloop.errno_from_exception(e)
if error_no in (errno.EAGAIN, errno.EINPROGRESS): if error_no in (errno.EAGAIN, errno.EINPROGRESS,
errno.EWOULDBLOCK):
uncomplete = True uncomplete = True
else: else:
logging.error(e) logging.error(e)
@ -349,7 +350,7 @@ class TCPRelayHandler(object):
data = self._local_sock.recv(BUF_SIZE) data = self._local_sock.recv(BUF_SIZE)
except (OSError, IOError) as e: except (OSError, IOError) as e:
if eventloop.errno_from_exception(e) in \ if eventloop.errno_from_exception(e) in \
(errno.ETIMEDOUT, errno.EAGAIN): (errno.ETIMEDOUT, errno.EAGAIN, errno.EWOULDBLOCK):
return return
if not data: if not data:
self.destroy() self.destroy()
@ -381,7 +382,7 @@ class TCPRelayHandler(object):
data = self._remote_sock.recv(BUF_SIZE) data = self._remote_sock.recv(BUF_SIZE)
except (OSError, IOError) as e: except (OSError, IOError) as e:
if eventloop.errno_from_exception(e) in \ if eventloop.errno_from_exception(e) in \
(errno.ETIMEDOUT, errno.EAGAIN): (errno.ETIMEDOUT, errno.EAGAIN, errno.EWOULDBLOCK):
return return
if not data: if not data:
self.destroy() self.destroy()
@ -610,7 +611,8 @@ class TCPRelay(object):
self._is_local) self._is_local)
except (OSError, IOError) as e: except (OSError, IOError) as e:
error_no = eventloop.errno_from_exception(e) error_no = eventloop.errno_from_exception(e)
if error_no in (errno.EAGAIN, errno.EINPROGRESS): if error_no in (errno.EAGAIN, errno.EINPROGRESS,
errno.EWOULDBLOCK):
continue continue
else: else:
logging.error(e) logging.error(e)