X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fstorage.py;h=38ffaae863e979eb93fca5e948e516eaa497dae3;hb=ecb31fcdc354471235ba44edbad3b24a6bded905;hp=9da1d6d7d1a475d5f0e2fbd7b4f83af26c83f363;hpb=4c173a5448990cd4da398be1bf3479bef17b1048;p=loctrkd.git

diff --git a/gps303/storage.py b/gps303/storage.py
index 9da1d6d..38ffaae 100644
--- a/gps303/storage.py
+++ b/gps303/storage.py
@@ -1,18 +1,17 @@
 """ Store zmq broadcasts to sqlite """
 
-from getopt import getopt
+from datetime import datetime, timezone
 from logging import getLogger
-from logging.handlers import SysLogHandler
-import sys
-from time import time
 import zmq
 
 from . import common
 from .evstore import initdb, stow
-from .gps303proto import parse_message
+from .gps303proto import proto_of_message
+from .zmsg import Bcast
 
 log = getLogger("gps303/storage")
 
+
 def runserver(conf):
     dbname = conf.get("storage", "dbfn")
     log.info('Using Sqlite3 database "%s"', dbname)
@@ -24,12 +23,26 @@ def runserver(conf):
 
     try:
         while True:
-            zmsg = zsub.recv()
-            imei = zmsg[1:17].decode()
-            packet = zmsg[17:]
-            msg = parse_message(packet)
-            log.debug("From IMEI %s: %s", imei, msg)
-            stow("", time(), imei, msg.length, msg.PROTO, msg.payload)
+            zmsg = Bcast(zsub.recv())
+            log.debug(
+                "IMEI %s from %s at %s: %s",
+                zmsg.imei,
+                zmsg.peeraddr,
+                datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
+                zmsg.packet.hex(),
+            )
+            if zmsg.peeraddr is not None:
+                addr, port = zmsg.peeraddr
+                peeraddr = str((str(addr), port))
+            else:
+                peeraddr = None
+            stow(
+                peeraddr=peeraddr,
+                when=zmsg.when,
+                imei=zmsg.imei,
+                proto=proto_of_message(zmsg.packet),
+                packet=zmsg.packet,
+            )
     except KeyboardInterrupt:
         pass