X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Flookaside.py;h=99b526d6b27bf5e30235f093a13caaf469ba728e;hb=97c5fc86f9fbab5df74879b9b2a705dbb8dcba63;hp=05b7a49a62a7240bfc39477d10a4deab97422021;hpb=ecb31fcdc354471235ba44edbad3b24a6bded905;p=loctrkd.git

diff --git a/gps303/lookaside.py b/gps303/lookaside.py
index 05b7a49..99b526d 100644
--- a/gps303/lookaside.py
+++ b/gps303/lookaside.py
@@ -2,23 +2,32 @@
 
 from datetime import datetime, timezone
 from logging import getLogger
+from os import umask
 from struct import pack
 import zmq
 
 from . import common
 from .gps303proto import parse_message, proto_by_name, WIFI_POSITIONING
 from .opencellid import qry_cell
-from .zmsg import Bcast, Resp
+from .zmsg import Bcast, LocEvt, Resp
 
 log = getLogger("gps303/lookaside")
 
 
 def runserver(conf):
     zctx = zmq.Context()
+    zpub = zctx.socket(zmq.PUB)
+    oldmask = umask(0o117)
+    zpub.bind(conf.get("lookaside", "publishurl"))
+    umask(oldmask)
     zsub = zctx.socket(zmq.SUB)
     zsub.connect(conf.get("collector", "publishurl"))
-    topic = pack("B", proto_by_name("WIFI_POSITIONING"))
-    zsub.setsockopt(zmq.SUBSCRIBE, topic)
+    for protoname in (
+        "GPS_POSITIONING",
+        "WIFI_POSITIONING",
+    ):
+        topic = pack("B", proto_by_name(protoname))
+        zsub.setsockopt(zmq.SUBSCRIBE, topic)
     zpush = zctx.socket(zmq.PUSH)
     zpush.connect(conf.get("collector", "listenurl"))
 
@@ -33,23 +42,29 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            if not isinstance(msg, WIFI_POSITIONING):
-                log.error(
-                    "IMEI %s from %s at %s: %s",
-                    zmsg.imei,
-                    zmsg.peeraddr,
-                    datetime.fromtimestamp(zmsg.when).astimezone(
-                        tz=timezone.utc
-                    ),
-                    msg,
+            if isinstance(msg, WIFI_POSITIONING):
+                is_gps = False
+                lat, lon = qry_cell(
+                    conf["opencellid"]["dbfn"], msg.mcc, msg.gsm_cells
                 )
-                continue
-            lat, lon = qry_cell(
-                conf["opencellid"]["dbfn"], msg.mcc, msg.gsm_cells
+                resp = Resp(
+                    imei=zmsg.imei, packet=msg.Out(lat=lat, lon=lon).packed
+                )
+                log.debug("Response for lat=%s, lon=%s: %s", lat, lon, resp)
+                zpush.send(resp.packed)
+            else:
+                is_gps = True
+                lat = msg.latitude
+                lon = msg.longitude
+            zpub.send(
+                LocEvt(
+                    imei=zmsg.imei,
+                    devtime=msg.devtime,
+                    is_gps=is_gps,
+                    lat=lat,
+                    lon=lon,
+                ).packed
             )
-            resp = Resp(imei=zmsg.imei, packet=msg.response(lat=lat, lon=lon))
-            log.debug("Response for lat=%s, lon=%s: %s", lat, lon, resp)
-            zpush.send(resp.packed)
 
     except KeyboardInterrupt:
         pass