LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-07-10 16:12:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad notification due to wrong system clock never ending

Browse Source
This commit is contained in:
Lonami Exo 2018-06-27 19:04:33 +02:00
parent f014c040a3
commit 18f06f1a25
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
telethon/network/mtprotosender.py
View File

@ -597,11 +597,24 @@ class MTProtoSender:
error_code:int = BadMsgNotification; error_code:int = BadMsgNotification;
""" """
bad_msg = message.obj bad_msg = message.obj
msg = self._pending_messages.get(bad_msg.bad_msg_id)
__log__.debug('Handling bad msg for message %d', bad_msg.bad_msg_id) __log__.debug('Handling bad msg for message %d', bad_msg.bad_msg_id)
if bad_msg.error_code in (16, 17): if bad_msg.error_code in (16, 17):
# Sent msg_id too low or too high (respectively). # Sent msg_id too low or too high (respectively).
# Use the current msg_id to determine the right time offset. # Use the current msg_id to determine the right time offset.
self.state.update_time_offset(correct_msg_id=message.msg_id) to = self.state.update_time_offset(correct_msg_id=message.msg_id)
__log__.info('System clock is wrong, set time offset to %ds', to)
# Correct the msg_id *of the message to resend*, not all.
#
# If we correct them all, new "bad message" would not find
# the old invalid IDs, causing all awaits to never finish.
if msg:
del self._pending_messages[msg.msg_id]
self.state.update_message_id(msg)
self._pending_messages[msg.msg_id] = msg
elif bad_msg.error_code == 32: elif bad_msg.error_code == 32:
# msg_seqno too low, so just pump it up by some "large" amount # msg_seqno too low, so just pump it up by some "large" amount
# TODO A better fix would be to start with a new fresh session ID # TODO A better fix would be to start with a new fresh session ID
@ -610,16 +623,15 @@ class MTProtoSender:
# msg_seqno too high never seems to happen but just in case # msg_seqno too high never seems to happen but just in case
self.state._sequence -= 16 self.state._sequence -= 16
else: else:
msg = self._pending_messages.pop(bad_msg.bad_msg_id, None)
if msg: if msg:
del self._pending_messages[msg.msg_id]
msg.future.set_exception(BadMessageError(bad_msg.error_code)) msg.future.set_exception(BadMessageError(bad_msg.error_code))
return return
# Messages are to be re-sent once we've corrected the issue # Messages are to be re-sent once we've corrected the issue
try: if msg:
self._send_queue.put_nowait( self._send_queue.put_nowait(msg)
self._pending_messages[bad_msg.bad_msg_id]) else:
except KeyError:
# May be MsgsAck, those are not saved in pending messages # May be MsgsAck, those are not saved in pending messages
__log__.info('Message %d not resent due to bad msg', __log__.info('Message %d not resent due to bad msg',
bad_msg.bad_msg_id) bad_msg.bad_msg_id)

8
telethon/network/mtprotostate.py
View File

@ -49,6 +49,13 @@ class MTProtoState:
after_id=after.msg_id if after else None after_id=after.msg_id if after else None
) )
def update_message_id(self, message):
"""
Updates the message ID to a new one,
used when the time offset changed.
"""
message.msg_id = self._get_new_msg_id()
@staticmethod @staticmethod
def _calc_key(auth_key, msg_key, client): def _calc_key(auth_key, msg_key, client):
""" """
@ -153,6 +160,7 @@ class MTProtoState:
correct = correct_msg_id >> 32 correct = correct_msg_id >> 32
self.time_offset = correct - now self.time_offset = correct - now
self._last_msg_id = 0 self._last_msg_id = 0
return self.time_offset
def _get_seq_no(self, content_related): def _get_seq_no(self, content_related):
""" """