Partly revert "Broadcast location, gps and approximated"

[loctrkd.git] / gps303 / zmsg.py

diff --git a/gps303/zmsg.py b/gps303/zmsg.py
index 7ab3ce4caf755271bd91531cc81f9103240d8b35..211011392a296f200cc6cbce99188ceda20c1f44 100644 (file)
--- a/gps303/zmsg.py
+++ b/gps303/zmsg.py
@@ -5,23 +5,24 @@ from struct import pack, unpack
 
 __all__ = "Bcast", "Resp"
 
+
 def pack_peer(peeraddr):
-    saddr, port, _x, _y = peeraddr
-    addr6 = ip.ip_address(saddr)
-    addr = addr6.ipv4_mapped
-    if addr is None:
-        addr = addr6
-    return pack("B", addr.version) + (addr.packed + b"\0\0\0\0\0\0\0\0\0\0\0\0")[:16] + pack("!H", port)
+    try:
+        saddr, port, _x, _y = peeraddr
+        addr = ip.ip_address(saddr)
+    except ValueError:
+        saddr, port = peeraddr
+        a4 = ip.ip_address(saddr)
+        addr = ip.IPv6Address(b"\0\0\0\0\0\0\0\0\0\0\xff\xff" + a4.packed)
+    return addr.packed + pack("!H", port)
+
 
 def unpack_peer(buffer):
-    version = buffer[0]
-    if version not in (4, 6):
-        return None
-    if version == 4:
-        addr = ip.IPv4Address(buffer[1:5])
-    else:
-        addr = ip.IPv6Address(buffer[1:17])
-    port = unpack("!H", buffer[17:19])[0]
+    a6 = ip.IPv6Address(buffer[:16])
+    port = unpack("!H", buffer[16:])[0]
+    addr = a6.ipv4_mapped
+    if addr is None:
+        addr = a6
     return (addr, port)
 
 
@@ -41,15 +42,36 @@ class _Zmsg:
                 + str(kwargs)
             )
 
+    def __repr__(self):
+        return "{}({})".format(
+            self.__class__.__name__,
+            ", ".join(
+                [
+                    "{}={}".format(
+                        k,
+                        'bytes.fromhex("{}")'.format(getattr(self, k).hex())
+                        if isinstance(getattr(self, k), bytes)
+                        else getattr(self, k),
+                    )
+                    for k, _ in self.KWARGS
+                ]
+            ),
+        )
+
+    def __eq__(self, other):
+        return all(
+            [getattr(self, k) == getattr(other, k) for k, _ in self.KWARGS]
+        )
+
     def decode(self, buffer):
-        raise RuntimeError(
-            self.__class__.__name__ + "must implement `encode()` method"
+        raise NotImplementedError(
+            self.__class__.__name__ + "must implement `decode()` method"
         )
 
     @property
     def packed(self):
-        raise RuntimeError(
-            self.__class__.__name__ + "must implement `encode()` method"
+        raise NotImplementedError(
+            self.__class__.__name__ + "must implement `packed()` property"
         )
 
 
@@ -69,7 +91,11 @@ class Bcast(_Zmsg):
         return (
             pack("B", self.proto)
             + ("0000000000000000" if self.imei is None else self.imei).encode()
-            + (b"\0\0\0\0\0\0\0\0" if self.when is None else pack("!d", self.when))
+            + (
+                b"\0\0\0\0\0\0\0\0"
+                if self.when is None
+                else pack("!d", self.when)
+            )
             + pack_peer(self.peeraddr)
             + self.packet
         )
@@ -80,8 +106,8 @@ class Bcast(_Zmsg):
         if self.imei == "0000000000000000":
             self.imei = None
         self.when = unpack("!d", buffer[17:25])[0]
-        self.peeraddr = unpack_peer(buffer[25:44])
-        self.packet = buffer[44:]
+        self.peeraddr = unpack_peer(buffer[25:43])
+        self.packet = buffer[43:]
 
 
 class Resp(_Zmsg):