X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=gps303%2Fcollector.py;h=9f305e55f60197f38d84e820a793192bb93abbc2;hb=97c5fc86f9fbab5df74879b9b2a705dbb8dcba63;hp=28c636d33642764118067bcadf0355377999b2c2;hpb=b613110bb16c95d9b641882c2ad6869e3ced1a0c;p=loctrkd.git diff --git a/gps303/collector.py b/gps303/collector.py index 28c636d..9f305e5 100644 --- a/gps303/collector.py +++ b/gps303/collector.py @@ -1,36 +1,28 @@ """ TCP server that communicates with terminals """ -from getopt import getopt -from logging import getLogger, StreamHandler, DEBUG, INFO -from logging.handlers import SysLogHandler -from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR +from logging import getLogger +from os import umask +from socket import socket, AF_INET6, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR from time import time -import sys +from struct import pack import zmq -from .config import readconfig -from .gps303proto import handle_packet, make_response, LOGIN, set_config - -CONF = "/etc/gps303.conf" +from . import common +from .gps303proto import ( + HIBERNATION, + LOGIN, + inline_response, + parse_message, + proto_of_message, +) +from .zmsg import Bcast, Resp log = getLogger("gps303/collector") -class Bcast: - """Zmq message to broadcast what was received from the terminal""" - def __init__(self, imei, msg): - self.as_bytes = imei.encode() + msg.encode() - - -class Resp: - """Zmq message received from a third party to send to the terminal""" - def __init__(self, msg): - self.imei = msg[:16].decode() - self.payload = msg[16:] - - class Client: """Connected socket to the terminal plus buffer and metadata""" + def __init__(self, sock, addr): self.sock = sock self.addr = addr @@ -38,25 +30,68 @@ class Client: self.imei = None def close(self): + log.debug("Closing fd %d (IMEI %s)", self.sock.fileno(), self.imei) self.sock.close() self.buffer = b"" - self.imei = None def recv(self): - segment = self.sock.recv(4096) - if not segment: + """Read from the socket and parse complete messages""" + try: + segment = self.sock.recv(4096) + except OSError: + log.warning( + "Reading from fd %d (IMEI %s): %s", + self.sock.fileno(), + self.imei, + e, + ) + return None + if not segment: # Terminal has closed connection + log.info( + "EOF reading from fd %d (IMEI %s)", + self.sock.fileno(), + self.imei, + ) return None when = time() self.buffer += segment - # implement framing properly - msg = handle_packet(packet, self.addr, when) - self.buffer = self.buffer[len(packet):] - if isinstance(msg, LOGIN): - self.imei = msg.imei - return msg + msgs = [] + while True: + framestart = self.buffer.find(b"xx") + if framestart == -1: # No frames, return whatever we have + break + if framestart > 0: # Should not happen, report + log.warning( + 'Undecodable data "%s" from fd %d (IMEI %s)', + self.buffer[:framestart].hex(), + self.sock.fileno(), + self.imei, + ) + self.buffer = self.buffer[framestart:] + # At this point, buffer starts with a packet + frameend = self.buffer.find(b"\r\n", 4) + if frameend == -1: # Incomplete frame, return what we have + break + packet = self.buffer[2:frameend] + self.buffer = self.buffer[frameend + 2 :] + if proto_of_message(packet) == LOGIN.PROTO: + self.imei = parse_message(packet).imei + log.info( + "LOGIN from fd %d (IMEI %s)", self.sock.fileno(), self.imei + ) + msgs.append((when, self.addr, packet)) + return msgs def send(self, buffer): - self.sock.send(buffer) + try: + self.sock.send(b"xx" + buffer + b"\r\n") + except OSError as e: + log.error( + "Sending to fd %d (IMEI %s): %s", + self.sock.fileno, + self.imei, + e, + ) class Clients: @@ -66,41 +101,58 @@ class Clients: def add(self, clntsock, clntaddr): fd = clntsock.fileno() + log.info("Start serving fd %d from %s", fd, clntaddr) self.by_fd[fd] = Client(clntsock, clntaddr) return fd def stop(self, fd): - clnt = by_fd[fd] + clnt = self.by_fd[fd] + log.info("Stop serving fd %d (IMEI %s)", clnt.sock.fileno(), clnt.imei) clnt.close() if clnt.imei: del self.by_imei[clnt.imei] del self.by_fd[fd] def recv(self, fd): - clnt = by_fd[fd] - msg = clnt.recv() - if isinstance(msg, LOGIN): - self.by_imei[clnt.imei] = clnt - return clnt.imei, msg - - def response(self, zmsg): - if zmsg.imei in self.by_imei: - clnt = self.by_imei[zmsg.imei].send(zmsg.payload) - - -def runserver(opts, conf): + clnt = self.by_fd[fd] + msgs = clnt.recv() + if msgs is None: + return None + result = [] + for when, peeraddr, packet in msgs: + if proto_of_message(packet) == LOGIN.PROTO: # Could do blindly... + self.by_imei[clnt.imei] = clnt + result.append((clnt.imei, when, peeraddr, packet)) + log.debug( + "Received from %s (IMEI %s): %s", + peeraddr, + clnt.imei, + packet.hex(), + ) + return result + + def response(self, resp): + if resp.imei in self.by_imei: + self.by_imei[resp.imei].send(resp.packet) + else: + log.info("Not connected (IMEI %s)", resp.imei) + + +def runserver(conf): zctx = zmq.Context() zpub = zctx.socket(zmq.PUB) + zpull = zctx.socket(zmq.PULL) + oldmask = umask(0o117) zpub.bind(conf.get("collector", "publishurl")) - zsub = zctx.socket(zmq.SUB) - zsub.connect(conf.get("collector", "listenurl")) - tcpl = socket(AF_INET, SOCK_STREAM) + zpull.bind(conf.get("collector", "listenurl")) + umask(oldmask) + tcpl = socket(AF_INET6, SOCK_STREAM) tcpl.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1) tcpl.bind(("", conf.getint("collector", "port"))) tcpl.listen(5) tcpfd = tcpl.fileno() poller = zmq.Poller() - poller.register(zsub, flags=zmq.POLLIN) + poller.register(zpull, flags=zmq.POLLIN) poller.register(tcpfd, flags=zmq.POLLIN) clients = Clients() try: @@ -108,44 +160,64 @@ def runserver(opts, conf): tosend = [] topoll = [] tostop = [] - events = poller.poll(10) + events = poller.poll(1000) for sk, fl in events: - if sk is zsub: + if sk is zpull: while True: try: - msg = zsub.recv(zmq.NOBLOCK) + msg = zpull.recv(zmq.NOBLOCK) tosend.append(Resp(msg)) except zmq.Again: break elif sk == tcpfd: - clntsock, clntaddr = ctlsock.accept() + clntsock, clntaddr = tcpl.accept() topoll.append((clntsock, clntaddr)) - else: - imei, msg = clients.recv(sk) - zpub.send(Bcast(imei, msg).as_bytes) - if msg is None or isinstance(msg, HIBERNATION): + elif fl & zmq.POLLIN: + received = clients.recv(sk) + if received is None: + log.debug( + "Terminal gone from fd %d (IMEI %s)", sk, imei + ) tostop.append(sk) + else: + for imei, when, peeraddr, packet in received: + proto = proto_of_message(packet) + zpub.send( + Bcast( + proto=proto, + imei=imei, + when=when, + peeraddr=peeraddr, + packet=packet, + ).packed + ) + if proto == HIBERNATION.PROTO: + log.debug( + "HIBERNATION from fd %d (IMEI %s)", + sk, + imei, + ) + tostop.append(sk) + respmsg = inline_response(packet) + if respmsg is not None: + clients.response( + Resp(imei=imei, packet=respmsg) + ) + else: + log.debug("Stray event: %s on socket %s", fl, sk) # poll queue consumed, make changes now for fd in tostop: + poller.unregister(fd) clients.stop(fd) - pollset.unregister(fd) for zmsg in tosend: + log.debug("Sending to the client: %s", zmsg) clients.response(zmsg) for clntsock, clntaddr in topoll: fd = clients.add(clntsock, clntaddr) - pollset.register(fd) + poller.register(fd, flags=zmq.POLLIN) except KeyboardInterrupt: pass if __name__.endswith("__main__"): - opts, _ = getopt(sys.argv[1:], "c:d") - opts = dict(opts) - conf = readconfig(opts["-c"] if "-c" in opts else CONF) - if sys.stdout.isatty(): - log.addHandler(StreamHandler(sys.stderr)) - else: - log.addHandler(SysLogHandler(address="/dev/log")) - log.setLevel(DEBUG if "-d" in opts else INFO) - log.info("starting with options: %s", opts) - runserver(opts, conf) + runserver(common.init(log))