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

fix fast open

Browse source
This commit is contained in:
clowwindy 2014-06-03 23:37:36 +08:00
parent a08edd2007
commit 944c422768
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -13,4 +13,3 @@ script:
- python test.py -c tests/salsa20.json - python test.py -c tests/salsa20.json
- python test.py -c tests/server-multi-passwd.json - python test.py -c tests/server-multi-passwd.json
- python test.py -c tests/workers.json - python test.py -c tests/workers.json
- python test.py -c tests/fastopen.json

8
shadowsocks/tcprelay.py
View file

@ -180,10 +180,8 @@ class TCPRelayHandler(object):
data = ''.join(self._data_to_write_to_local) data = ''.join(self._data_to_write_to_local)
l = len(data) l = len(data)
s = self._remote_sock.sendto(data, MSG_FASTOPEN, s = self._remote_sock.sendto(data, MSG_FASTOPEN,
self.remote_address) (self._config['server'],
self._loop.add(self._remote_sock, self._config['server_port']))
eventloop.POLL_ERR | eventloop.POLL_OUT)
self._update_stream(STREAM_DOWN, WAIT_STATUS_READING)
if s < l: if s < l:
data = data[s:] data = data[s:]
self._data_to_write_to_local = [data] self._data_to_write_to_local = [data]
@ -195,7 +193,6 @@ class TCPRelayHandler(object):
except (OSError, IOError) as e: except (OSError, IOError) as e:
if eventloop.errno_from_exception(e) == errno.EINPROGRESS: if eventloop.errno_from_exception(e) == errno.EINPROGRESS:
self._update_stream(STREAM_UP, WAIT_STATUS_READWRITING) self._update_stream(STREAM_UP, WAIT_STATUS_READWRITING)
self._update_stream(STREAM_DOWN, WAIT_STATUS_READING)
elif eventloop.errno_from_exception(e) == errno.ENOTCONN: elif eventloop.errno_from_exception(e) == errno.ENOTCONN:
logging.error('fast open not supported on this OS') logging.error('fast open not supported on this OS')
self._config['fast_open'] = False self._config['fast_open'] = False
@ -264,6 +261,7 @@ class TCPRelayHandler(object):
if self._is_local and self._config['fast_open']: if self._is_local and self._config['fast_open']:
# wait for more data to arrive and send them in one SYN # wait for more data to arrive and send them in one SYN
self._stage = STAGE_REPLY self._stage = STAGE_REPLY
self._loop.add(remote_sock, eventloop.POLL_ERR)
# TODO when there is already data in this packet # TODO when there is already data in this packet
else: else:
try: try: