X-Git-Url: http://www.average.org/gitweb/?a=blobdiff_plain;f=loctrkd%2Fzx303proto.py;h=ebead92e0e28c88f64517547ed8ac1828fa5d301;hb=63a086cf3956b93f760b1a0344afd757e0d0392f;hp=efb02d249f6c118185ce2a66b23675c9acf85efd;hpb=832ec0fbf577bb2fab92b6e39dbc0feaad5ad2bf;p=loctrkd.git diff --git a/loctrkd/zx303proto.py b/loctrkd/zx303proto.py index efb02d2..ebead92 100755 --- a/loctrkd/zx303proto.py +++ b/loctrkd/zx303proto.py @@ -81,7 +81,7 @@ __all__ = ( "UNKNOWN_B3", ) -PROTO_PREFIX = "ZX" +PROTO_PREFIX = "ZX:" ### Deframer ### @@ -93,7 +93,7 @@ class Stream: self.buffer = b"" @staticmethod - def enframe(buffer: bytes) -> bytes: + def enframe(buffer: bytes, imei: Optional[str] = None) -> bytes: return b"xx" + buffer + b"\r\n" def recv(self, segment: bytes) -> List[Union[bytes, str]]: @@ -876,15 +876,9 @@ def class_by_prefix( def proto_name(obj: Union[MetaPkt, GPS303Pkt]) -> str: - return ( - PROTO_PREFIX - + ":" - + ( - obj.__class__.__name__ - if isinstance(obj, GPS303Pkt) - else obj.__name__ - ) - ).ljust(16, "\0")[:16] + return PROTO_PREFIX + ( + obj.__class__.__name__ if isinstance(obj, GPS303Pkt) else obj.__name__ + ) def proto_by_name(name: str) -> int: