X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fzmsg.py;h=6e591ab65c2fb9a8c4ec7ff7a9bcab8d69e7de08;hb=5d056391aed17388fb8c2bfe71fd9eade2fe5c55;hp=cdd23fcd5eb7e1d36d02d0c5527ff3f7bc4d4074;hpb=513eaed4a832748bd77294679939627eaaf69612;p=loctrkd.git

diff --git a/gps303/zmsg.py b/gps303/zmsg.py
index cdd23fc..6e591ab 100644
--- a/gps303/zmsg.py
+++ b/gps303/zmsg.py
@@ -5,10 +5,19 @@ from struct import pack, unpack
 
 __all__ = "Bcast", "Resp"
 
+
 def pack_peer(peeraddr):
-    saddr, port = peeraddr
-    addr = ip.ip_address(saddr)
-    return pack("B", addr.version) + (addr.packed + b"\0\0\0\0\0\0\0\0\0\0\0\0")[:16] + pack("!H", port)
+    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)
+    )
+
 
 def unpack_peer(buffer):
     version = buffer[0]
@@ -38,6 +47,22 @@ 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 decode(self, buffer):
         raise RuntimeError(
             self.__class__.__name__ + "must implement `encode()` method"
@@ -66,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
         )