X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2F__main__.py;h=d3d6d1e7bfc5d0c8bf54205e1039cebcbcee5bef;hb=b613110bb16c95d9b641882c2ad6869e3ced1a0c;hp=a3d4f07d6d1d4a702dd5cab573fa4e538510b69f;hpb=c08595626e4e339c8d31272c0d7d6c7d52b8d069;p=loctrkd.git

diff --git a/gps303/__main__.py b/gps303/__main__.py
index a3d4f07..d3d6d1e 100755
--- a/gps303/__main__.py
+++ b/gps303/__main__.py
@@ -7,26 +7,28 @@ import sys
 from time import time
 
 from .config import readconfig
-from .GT06mod import handle_packet, make_response, LOGIN
+from .gps303proto import handle_packet, make_response, LOGIN, set_config
 from .evstore import initdb, stow
+from .lookaside import prepare_response
 
 CONF = "/etc/gps303.conf"
 
 log = getLogger("gps303")
 
 if __name__.endswith("__main__"):
-    opts, _ = getopt(sys.argv[1:], "c:p:")
+    opts, _ = getopt(sys.argv[1:], "c:d")
     opts = dict(opts)
-    conf = readconfig(opts["c"] if "c" in opts else CONF)
+    conf = readconfig(opts["-c"] if "-c" in opts else CONF)
 
     if sys.stdout.isatty():
         log.addHandler(StreamHandler(sys.stderr))
-        log.setLevel(DEBUG)
     else:
         log.addHandler(SysLogHandler(address="/dev/log"))
-        log.setLevel(INFO)
+    log.setLevel(DEBUG if "-d" in opts else INFO)
+    log.info("starting with options: %s", opts)
 
-    initdb(conf.get("daemon", "port"))
+    initdb(conf.get("daemon", "dbfn"))
+    set_config(conf)
 
     ctlsock = socket(AF_INET, SOCK_STREAM)
     ctlsock.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
@@ -68,12 +70,20 @@ if __name__.endswith("__main__"):
                     when = time()
                     if packet:
                         msg = handle_packet(packet, clntaddr, when)
-                        log.debug("%s from %s fd %d'", msg, clntaddr, fd)
+                        log.debug("%s from %s fd %d", msg, clntaddr, fd)
                         if isinstance(msg, LOGIN):
                             imei = msg.imei
                             clnt_dict[fd] = (clntsock, clntaddr, imei)
-                        stow(clntaddr, when, imei, msg.proto, msg.payload)
-                        response = make_response(msg)
+                        stow(
+                            clntaddr,
+                            when,
+                            imei,
+                            msg.length,
+                            msg.proto,
+                            msg.payload,
+                        )
+                        kwargs = prepare_response(conf, msg)
+                        response = make_response(msg, **kwargs)
                         if response:
                             try:
                                 # Ignore possibility of blocking
@@ -81,6 +91,7 @@ if __name__.endswith("__main__"):
                             except OSError as e:
                                 log.debug("sending to fd %d error %s", fd, e)
                     else:
+                        # TODO: Also disconnect on HIBERNATION
                         log.info("disconnect fd %d imei %s", fd, imei)
                         pollset.unregister(fd)
                         clntsock.close()