X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=loctrkd%2Fbeesure.py;h=41b25e0bbac0141e8691303bcdd69ca9ffc5eac6;hb=4685264dbad5f904124e9bb390a36c8902a544d5;hp=35682bd1028a8e0e0dcb7c7d96c356f7e1d8c8ac;hpb=c9f23958d20dfc6578b9f76706bd8b3e687389b0;p=loctrkd.git

diff --git a/loctrkd/beesure.py b/loctrkd/beesure.py
index 35682bd..41b25e0 100755
--- a/loctrkd/beesure.py
+++ b/loctrkd/beesure.py
@@ -601,22 +601,28 @@ def parse_message(packet: bytes, is_incoming: bool = True) -> BeeSurePkt:
     """From a packet (without framing bytes) derive the XXX.In object"""
     toskip, vendor, imei, datalength = _framestart(packet)
     bsplits = packet[20:-1].split(b",", 1)
-    if len(bsplits) == 2:
+    try:
         proto = bsplits[0].decode("ascii")
+    except UnicodeDecodeError:
+        proto = str(bsplits[0])
+    if len(bsplits) == 2:
         rest = bsplits[1]
     else:
-        proto = ""
-        rest = bsplits[0]
+        rest = b""
     if proto in CLASSES:
         cls = CLASSES[proto].In if is_incoming else CLASSES[proto].Out
         payload = (
-            rest if cls.BINARY else rest.decode("Windows-1252").split(",")
+            # Some people encode their SSIDs in non-utf8
+            rest
+            if cls.BINARY
+            else rest.decode("Windows-1252").split(",")
         )
         try:
             return cls(vendor, imei, datalength, payload)
         except (DecodeError, ValueError, IndexError) as e:
             cause: Union[DecodeError, ValueError, IndexError] = e
     else:
+        payload = rest
         cause = ValueError(f"Proto {proto} is unknown")
     if is_incoming:
         retobj = UNKNOWN.In(vendor, imei, datalength, payload)