""" TCP server that communicates with terminals """
from logging import getLogger
+from os import umask
from socket import socket, AF_INET6, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR
from time import time
from struct import pack
)
self.buffer = self.buffer[framestart:]
# At this point, buffer starts with a packet
- frameend = self.buffer.find(b"\r\n", 4)
+ if len(self.buffer) < 6: # no len and proto - cannot proceed
+ break
+ exp_end = self.buffer[2] + 3 # Expect '\r\n' here
+ frameend = 0
+ # Length field can legitimeely be much less than the
+ # length of the packet (e.g. WiFi positioning), but
+ # it _should not_ be greater. Still sometimes it is.
+ # Luckily, not by too much: by maybe two or three bytes?
+ # Do this embarrassing hack to avoid accidental match
+ # of some binary data in the packet against '\r\n'.
+ while True:
+ frameend = self.buffer.find(b"\r\n", frameend)
+ if frameend >= (exp_end - 3): # Found realistic match
+ break
if frameend == -1: # Incomplete frame, return what we have
break
packet = self.buffer[2:frameend]
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
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):
def runserver(conf):
zctx = zmq.Context()
zpub = zctx.socket(zmq.PUB)
- zpub.bind(conf.get("collector", "publishurl"))
zpull = zctx.socket(zmq.PULL)
+ oldmask = umask(0o117)
+ zpub.bind(conf.get("collector", "publishurl"))
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")))
while True:
try:
msg = zpull.recv(zmq.NOBLOCK)
- tosend.append(Resp(msg))
+ zmsg = Resp(msg)
+ tosend.append(zmsg)
except zmq.Again:
break
elif sk == tcpfd:
elif fl & zmq.POLLIN:
received = clients.recv(sk)
if received is None:
- log.debug(
- "Terminal gone from fd %d (IMEI %s)", sk, imei
- )
+ log.debug("Terminal gone from fd %d", sk)
tostop.append(sk)
else:
for imei, when, peeraddr, packet in received:
tostop.append(sk)
respmsg = inline_response(packet)
if respmsg is not None:
- clients.response(
- Resp(imei=imei, packet=respmsg)
+ tosend.append(
+ Resp(imei=imei, when=when, packet=respmsg)
)
else:
log.debug("Stray event: %s on socket %s", fl, sk)
poller.unregister(fd)
clients.stop(fd)
for zmsg in tosend:
+ zpub.send(
+ Bcast(
+ is_incoming=False,
+ proto=proto_of_message(zmsg.packet),
+ when=zmsg.when,
+ imei=zmsg.imei,
+ packet=zmsg.packet,
+ ).packed
+ )
log.debug("Sending to the client: %s", zmsg)
clients.response(zmsg)
for clntsock, clntaddr in topoll: