X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=loctrkd%2Fcollector.py;h=22bc9c3ffa2014346d74fd13b19de48d6d098472;hb=5ac485743c88a3814821bea386df01b9aaa1d4a1;hp=c6261d705bfb9886fadf42dbb659dd12860754bf;hpb=dbdf9d63af31770ad57302e16b17a2fdc526773f;p=loctrkd.git

diff --git a/loctrkd/collector.py b/loctrkd/collector.py
index c6261d7..22bc9c3 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) -> 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:
         ...
@@ -61,10 +61,6 @@ class ProtoModule:
     def proto_of_message(packet: bytes) -> str:
         ...
 
-    @staticmethod
-    def proto_by_name(name: str) -> int:
-        ...
-
 
 pmods: List[ProtoModule] = []
 
@@ -139,9 +135,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))
+            self.sock.send(self.pmod.enframe(buffer, imei=self.imei))
         except OSError as e:
             log.error(
                 "Sending to fd %d (IMEI %s): %s",