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

Fix a OTA bug on _ota_chunk_data (#642)

Browse source 
* fix a OTA bug

* correct a wrong comment
This commit is contained in:
loggerhead 2016-10-10 23:05:20 +08:00 committed by mengskysama
parent 5cd9f04948
commit 4f28f7c8e4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/tcprelay.py
View file

@ -358,7 +358,7 @@ class TCPRelayHandler(object):
b'\x00\x00\x00\x00\x10\x10'),
self._local_sock)
# spec https://shadowsocks.org/en/spec/one-time-auth.html
# ATYP & 0x10 == 1, then OTA is enabled.
# ATYP & 0x10 == 0x10, then OTA is enabled.
if self._ota_enable_session:
data = common.chr(addrtype | ADDRTYPE_AUTH) + data[1:]
key = self._encryptor.cipher_iv + self._encryptor.key
@ -458,7 +458,7 @@ class TCPRelayHandler(object):
return
data_len = self._ota_buff_head[:ONETIMEAUTH_CHUNK_DATA_LEN]
self._ota_len = struct.unpack('>H', data_len)[0]
length = min(self._ota_len, len(data))
length = min(self._ota_len - len(self._ota_buff_data), len(data))
self._ota_buff_data += data[:length]
data = data[length:]
if len(self._ota_buff_data) == self._ota_len: