X-Git-Url: http://www.average.org/gitweb/?p=loctrkd.git;a=blobdiff_plain;f=loctrkd%2Fcollector.py;h=98345007b708ad446c80c39d04d42fe7c52fd6e1;hp=136ecba99aeeb602ee85028caadc0caa0caf744d;hb=5ef83cb7db7464a5a625b0b7c86c4e25ebbb0de1;hpb=63a086cf3956b93f760b1a0344afd757e0d0392f diff --git a/loctrkd/collector.py b/loctrkd/collector.py index 136ecba..9834500 100644 --- a/loctrkd/collector.py +++ b/loctrkd/collector.py @@ -27,16 +27,16 @@ MAXBUFFER: int = 4096 class ProtoModule: class Stream: - @staticmethod - def enframe(buffer: bytes, imei: Optional[str] = None) -> bytes: - ... - def recv(self, segment: bytes) -> List[Union[bytes, str]]: ... def close(self) -> bytes: ... + @staticmethod + def enframe(buffer: bytes, imei: Optional[str] = None) -> bytes: + ... + @staticmethod def probe_buffer(buffer: bytes) -> bool: ... @@ -139,9 +139,9 @@ class Client: return msgs def send(self, buffer: bytes) -> None: - assert self.stream is not None + assert self.stream is not None and self.pmod is not None try: - self.sock.send(self.stream.enframe(buffer, imei=self.imei)) + self.sock.send(self.pmod.enframe(buffer, imei=self.imei)) except OSError as e: log.error( "Sending to fd %d (IMEI %s): %s",