LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-18 12:30:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add more useful logging on invalid packet length received

Browse Source
This commit is contained in:
Lonami Exo 2018-01-13 19:26:45 +01:00
parent 0d429f55c5
commit c5e969d585
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
telethon/network/connection.py
View File

@ -2,6 +2,7 @@
This module holds both the Connection class and the ConnectionMode enum, This module holds both the Connection class and the ConnectionMode enum,
which specifies the protocol to be used by the Connection. which specifies the protocol to be used by the Connection.
""" """
import logging
import os import os
import struct import struct
from datetime import timedelta from datetime import timedelta
@ -14,6 +15,8 @@ from ..crypto import AESModeCTR
from ..extensions import TcpClient from ..extensions import TcpClient
from ..errors import InvalidChecksumError from ..errors import InvalidChecksumError
__log__ = logging.getLogger(__name__)
class ConnectionMode(Enum): class ConnectionMode(Enum):
"""Represents which mode should be used to stabilise a connection. """Represents which mode should be used to stabilise a connection.
@ -181,6 +184,21 @@ class Connection:
packet_len_seq = self.read(8) # 4 and 4 packet_len_seq = self.read(8) # 4 and 4
packet_len, seq = struct.unpack('<ii', packet_len_seq) packet_len, seq = struct.unpack('<ii', packet_len_seq)
# Sometimes Telegram seems to send a packet length of 0 (12)
# and after that, just a single byte. Not sure what this is.
# TODO Figure out what this is, and if there's a better fix.
if packet_len <= 12:
__log__.error('Read invalid packet length %d, '
'reading data left:', packet_len)
while True:
try:
__log__.error(repr(self.read(1)))
except TimeoutError:
break
# Connection reset and hope it's fixed after
self.conn.close()
raise ConnectionResetError()
body = self.read(packet_len - 12) body = self.read(packet_len - 12)
checksum = struct.unpack('<I', self.read(4))[0] checksum = struct.unpack('<I', self.read(4))[0]