X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Ftermconfig.py;fp=gps303%2Ftermconfig.py;h=4bf148bb9a6a76378947d8f70efd7b63d22d6ae8;hb=2052991786319930bccf63f347dbc121774e9018;hp=10c6286d544a76722a707a0cd0cdc73ad3e884ea;hpb=c91cccfb91f1ea45dc886e2d75796e3af0b7f00f;p=loctrkd.git

diff --git a/gps303/termconfig.py b/gps303/termconfig.py
index 10c6286..4bf148b 100644
--- a/gps303/termconfig.py
+++ b/gps303/termconfig.py
@@ -6,13 +6,14 @@ from struct import pack
 import zmq
 
 from . import common
-from .gps303proto import parse_message, proto_by_name
+from .gps303proto import *
 from .zmsg import Bcast, Resp
 
 log = getLogger("gps303/termconfig")
 
 
 def runserver(conf):
+    termconfig = common.normconf(conf["termconfig"])
     zctx = zmq.Context()
     zsub = zctx.socket(zmq.SUB)
     zsub.connect(conf.get("collector", "publishurl"))
@@ -41,8 +42,28 @@ def runserver(conf):
                 datetime.fromtimestamp(zmsg.when).astimezone(tz=timezone.utc),
                 msg,
             )
-            # TODO get data from the config
-            resp = Resp(imei=zmsg.imei, packet=msg.response())
+            kwargs = {}
+            if isinstance(msg, STATUS):
+                kwargs = {
+                    "upload_interval": termconf.get(
+                        "statusintervalminutes", 25
+                    )
+                }
+            elif isinstance(msg, SETUP):
+                for key in (
+                    "uploadintervalseconds",
+                    "binaryswitch",
+                    "alarms",
+                    "dndtimeswitch",
+                    "dndtimes",
+                    "gpstimeswitch",
+                    "gpstimestart",
+                    "gpstimestop",
+                    "phonenumbers",
+                ):
+                    if key in termconfig:
+                        kwargs[key] = termconfig[key]
+            resp = Resp(imei=zmsg.imei, packet=msg.response(**kwargs))
             log.debug("Response: %s", resp)
             zpush.send(resp.packed)