X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2F__main__.py;h=e3fd84a2460271a69fb65acfee1485e406e06a89;hb=45e5cd8ce6f931b3bfb291394336cf8d94d895c3;hp=ef03c61eff92d9ef31dcdefba8f6920025dcb696;hpb=da4a83724f675e9b46639742eb095dc5b17a357f;p=loctrkd.git diff --git a/gps303/__main__.py b/gps303/__main__.py index ef03c61..e3fd84a 100755 --- a/gps303/__main__.py +++ b/gps303/__main__.py @@ -9,6 +9,7 @@ from time import time from .config import readconfig from .GT06mod import handle_packet, make_response, LOGIN, set_config from .evstore import initdb, stow +from .lookaside import prepare_response CONF = "/etc/gps303.conf" @@ -69,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 @@ -82,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()