From 49565bff10ca620901ad9592dd9fff08b96f3fab Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Mon, 15 Aug 2022 00:11:15 +0200 Subject: [PATCH] Fix followup packet reading --- rcon/source/client.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/rcon/source/client.py b/rcon/source/client.py index 5ccb9d2..5b8e434 100644 --- a/rcon/source/client.py +++ b/rcon/source/client.py @@ -28,18 +28,14 @@ class Client(BaseClient, socket_type=SOCK_STREAM): if self._max_packet_size is None: return packet - if len(packet.payload) >= self._max_packet_size: - return packet + self.read_followup_packet() - - return packet + if len(packet.payload) < self._max_packet_size: + return packet - def read_followup_packet(self) -> Packet | None: - """Reads a potential followup packet.""" - with ChangedTimeout(self, 1) as client: + with ChangedTimeout(self, 1): try: - return client.read() + return packet + Packet.read(file) except TimeoutError: - return None + return packet def login(self, passwd: str, *, encoding: str = 'utf-8') -> bool: """Perform a login.""" @@ -75,10 +71,9 @@ class ChangedTimeout: self.timeout = timeout self.original_timeout = None - def __enter__(self) -> Client: + def __enter__(self) -> None: self.original_timeout = self.client.timeout self.client.timeout = self.timeout - return self.client def __exit__(self, exc_type, exc_val, exc_tb): self.client.timeout = self.original_timeout