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

remove unnecessary overwrite

Browse source
This commit is contained in:
clowwindy 2015-08-03 01:40:18 +08:00
parent 999a54168e
commit 4211184886
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shadowsocks/eventloop.py
View file

@ -176,9 +176,8 @@ class EventLoop(object):
def remove_periodic(self, callback): def remove_periodic(self, callback):
self._periodic_callbacks.remove(callback) self._periodic_callbacks.remove(callback)
def modify(self, f, mode, handler): def modify(self, f, mode):
fd = f.fileno() fd = f.fileno()
self._fdmap[fd] = (f, handler)
self._impl.modify(fd, mode) self._impl.modify(fd, mode)
def stop(self): def stop(self):

4
shadowsocks/tcprelay.py
View file

@ -173,14 +173,14 @@ class TCPRelayHandler(object):
event |= eventloop.POLL_OUT event |= eventloop.POLL_OUT
if self._upstream_status & WAIT_STATUS_READING: if self._upstream_status & WAIT_STATUS_READING:
event |= eventloop.POLL_IN event |= eventloop.POLL_IN
self._loop.modify(self._local_sock, event, self._server) self._loop.modify(self._local_sock, event)
if self._remote_sock: if self._remote_sock:
event = eventloop.POLL_ERR event = eventloop.POLL_ERR
if self._downstream_status & WAIT_STATUS_READING: if self._downstream_status & WAIT_STATUS_READING:
event |= eventloop.POLL_IN event |= eventloop.POLL_IN
if self._upstream_status & WAIT_STATUS_WRITING: if self._upstream_status & WAIT_STATUS_WRITING:
event |= eventloop.POLL_OUT event |= eventloop.POLL_OUT
self._loop.modify(self._remote_sock, event, self._server) self._loop.modify(self._remote_sock, event)
def _write_to_sock(self, data, sock): def _write_to_sock(self, data, sock):
# write data to sock # write data to sock