From 99c075c3fab5dfb093c7ff522f390af1f86cac83 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Sun, 21 Aug 2022 15:06:08 +0200 Subject: [PATCH] Check fragmentation by threshold check --- rcon/source/client.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/rcon/source/client.py b/rcon/source/client.py index b3e2760..cff09a3 100644 --- a/rcon/source/client.py +++ b/rcon/source/client.py @@ -13,12 +13,11 @@ __all__ = ['Client'] class Client(BaseClient, socket_type=SOCK_STREAM): """An RCON client.""" - _frag_detect: str | None = None - def __init_subclass__( cls, *args, - frag_detect: str | None = None, + frag_threshold: int = 4096, + frag_detect_cmd: str = '', **kwargs ): """Set an optional fragmentation command @@ -30,9 +29,8 @@ class Client(BaseClient, socket_type=SOCK_STREAM): For details see: https://wiki.vg/RCON#Fragmentation """ super().__init_subclass__(*args, **kwargs) - - if frag_detect is not None: - cls._frag_detect = frag_detect + cls.frag_threshold = frag_threshold + cls.frag_detect_cmd = frag_detect_cmd def communicate(self, packet: Packet) -> Packet: """Send and receive a packet.""" @@ -41,11 +39,11 @@ class Client(BaseClient, socket_type=SOCK_STREAM): response = self.read() - if self._frag_detect is None: + if len(response.payload) < self.frag_threshold: return response with self._socket.makefile('wb') as file: - file.write(bytes(Packet.make_command(self._frag_detect))) + file.write(bytes(Packet.make_command(self.frag_detect_cmd))) while (successor := self.read()).id == response.id: response += successor