X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2F__main__.py;h=51e462c3fcdf07b68fa5024bf7334dcdb83af522;hb=8be4295a5027349ebbf5242d131c5a942181f7a6;hp=ddad2b780ea600df2b8da438d87d45d7e0fa39af;hpb=d0da38575fdb1c67188c3bfc9cbdf5f03ba58b69;p=loctrkd.git

diff --git a/gps303/__main__.py b/gps303/__main__.py
index ddad2b7..51e462c 100755
--- a/gps303/__main__.py
+++ b/gps303/__main__.py
@@ -7,8 +7,9 @@ import sys
 from time import time
 
 from .config import readconfig
-from .GT06mod import handle_packet, make_response, LOGIN, set_config
+from .gps303proto import handle_packet, make_response, LOGIN, set_config
 from .evstore import initdb, stow
+from .lookaside import prepare_response
 
 CONF = "/etc/gps303.conf"
 
@@ -68,7 +69,7 @@ if __name__.endswith("__main__"):
                     packet = clntsock.recv(4096)
                     when = time()
                     if packet:
-                        msg = handle_packet(packet, clntaddr, when)
+                        msg = handle_packet(packet)
                         log.debug("%s from %s fd %d", msg, clntaddr, fd)
                         if isinstance(msg, LOGIN):
                             imei = msg.imei
@@ -78,10 +79,11 @@ if __name__.endswith("__main__"):
                             when,
                             imei,
                             msg.length,
-                            msg.proto,
+                            msg.PROTO,
                             msg.payload,
                         )
-                        response = make_response(msg)
+                        kwargs = prepare_response(conf, msg)
+                        response = make_response(msg, **kwargs)
                         if response:
                             try:
                                 # Ignore possibility of blocking