xuemingqiang/shadowsocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ota call write_to_sock multi

Browse Source
This commit is contained in:
mengskysama
2016-09-04 01:18:13 -07:00
parent 56bf81f58a
commit 5c11527e1b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shadowsocks/tcprelay.py
View File

@ -449,6 +449,7 @@ class TCPRelayHandler(object):
def _ota_chunk_data(self, data, data_cb): def _ota_chunk_data(self, data, data_cb):
# spec https://shadowsocks.org/en/spec/one-time-auth.html # spec https://shadowsocks.org/en/spec/one-time-auth.html
unchunk_data = b''
while len(data) > 0: while len(data) > 0:
if self._ota_len == 0: if self._ota_len == 0:
# get DATA.LEN + HMAC-SHA1 # get DATA.LEN + HMAC-SHA1
@ -472,11 +473,12 @@ class TCPRelayHandler(object):
if onetimeauth_verify(_hash, _data, key) is False: if onetimeauth_verify(_hash, _data, key) is False:
logging.warn('one time auth fail, drop chunk !') logging.warn('one time auth fail, drop chunk !')
else: else:
data_cb(self._ota_buff_data) unchunk_data += _data
self._ota_chunk_idx += 1 self._ota_chunk_idx += 1
self._ota_buff_head = b'' self._ota_buff_head = b''
self._ota_buff_data = b'' self._ota_buff_data = b''
self._ota_len = 0 self._ota_len = 0
data_cb(unchunk_data)
return return
def _ota_chunk_data_gen(self, data): def _ota_chunk_data_gen(self, data):