display tag fro alterts, cleanup udp

hbd/server/udp.py

@@ -47,7 +47,7 @@ def parse_message(data: bytes):
     return msg
 
 
-def dicttos(ID, d, compress=False):
+def dicttos(ID, d):
     s = []
     for k in d:
         if isinstance(d[k], float):
@@ -55,13 +55,9 @@ def dicttos(ID, d, compress=False):
         else:
             s.append("%s=%s" % (k, d[k]))
     pk = ";".join(s)
-    if compress:
-        zpk = zlib.compress(pk.encode(), 6)
-        ID = "!" + ID + ":"
-        opk = ID.encode() + zpk
-    else:
-        zpk = pk
-        opk = ID + ":" + zpk
+    zpk = zlib.compress(pk.encode(), 6)
+    ID = "!" + ID + ":"
+    opk = ID.encode() + zpk
     return opk
 
 
@@ -119,12 +115,24 @@ def handle_datagram(msg: dict, addr, transport, ctx: dict):
 
     cid = msg.get("id", 0)
     try:
-        rtt = float(msg.get("rtt", None))
-    except Exception:
+        rtt = float(msg.get("rtt"))
+    except TypeError:
         rtt = None
 
     if msg.get("ID") == "HTB":
         host.doesack = msg.get("acks", -1)
+        # send ACK back
+        rmsg = {"time": __import__("time").time()}
+        if host.cver < 1:
+            opkt = b"ACK"
+        else:
+            opkt = dicttos("ACK", rmsg)
+        try:
+            transport.sendto(opkt, addr)
+        except Exception as e:
+            if DEBUG > 0:
+                print(("cannot send ack: %s" % e))
+
     elif msg.get("ID") == "PLG":
         # Handle plugin data message
         plugin_name = msg.get("plugin")
@@ -277,18 +285,6 @@ def handle_datagram(msg: dict, addr, transport, ctx: dict):
             alert_states=host.alert_states
         )
 
-    # send ACK back
-    rmsg = {"time": __import__("time").time()}
-    if host.cver < 1:
-        opkt = b"ACK"
-    else:
-        opkt = dicttos("ACK", rmsg, host.cver > 1)
-    try:
-        transport.sendto(opkt, addr)
-    except Exception as e:
-        if DEBUG > 0:
-            print(("cannot send ack: %s" % e))
-
     # send any commands we have queued
     while len(host.cmds):
         op, rmsg = host.cmds[0]
@@ -311,7 +307,7 @@ def handle_datagram(msg: dict, addr, transport, ctx: dict):
             if isinstance(opkt, str):
                 opkt = opkt.encode()
         else:
-            opkt = dicttos(op, rmsg, True)
+            opkt = dicttos(op, rmsg)
         try:
             transport.sendto(opkt, addr)
         except Exception as e: