More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index d5ac4bd3b4487569e3cd681badff6883b6b4a801..c40ed3b899ede027e704361512a0e68fd453a85e 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -39,6 +39,8 @@
 #include "interface.h"
 #include "extract.h"
 
+static const char tstr[] = " [|zmtp1]";
+
 /* Maximum number of ZMTP/1.0 frame body bytes (without the flags) to dump in
  * hex and ASCII under a single "-v" flag.
  */
@@ -87,7 +89,7 @@ zmtp1_print_frame(const u_char *cp, const u_char *ep) {
                body_len_declared = cp[0];
                if (body_len_declared == 0)
                        return cp + header_len; /* skip to next frame */
-               printf(" frame flags+body  (8-bit) length %"PRIu8"", cp[0]);
+               printf(" frame flags+body  (8-bit) length %u", cp[0]);
                TCHECK2(*cp, header_len + 1); /* length, flags */
                flags = cp[1];
        } else {
@@ -97,15 +99,15 @@ zmtp1_print_frame(const u_char *cp, const u_char *ep) {
                body_len_declared = EXTRACT_64BITS(cp + 1);
                if (body_len_declared == 0)
                        return cp + header_len; /* skip to next frame */
-               printf(" %"PRIu64"", body_len_declared);
+               printf(" %" PRIu64, body_len_declared);
                TCHECK2(*cp, header_len + 1); /* 0xFF, length, flags */
                flags = cp[9];
        }
 
        body_len_captured = ep - cp - header_len;
        if (body_len_declared > body_len_captured)
-               printf(" (%"PRIu64" captured)", body_len_captured);
-       printf(", flags 0x%02"PRIx8"", flags);
+               printf(" (%" PRIu64 " captured)", body_len_captured);
+       printf(", flags 0x%02x", flags);
 
        if (vflag) {
                u_int64_t body_len_printed = MIN(body_len_captured, body_len_declared);
@@ -123,7 +125,7 @@ zmtp1_print_frame(const u_char *cp, const u_char *ep) {
                if (vflag == 1)
                        body_len_printed = MIN(VBYTES + 1, body_len_printed);
                if (body_len_printed > 1) {
-                       printf(", first %"PRIu64" byte(s) of body:", body_len_printed - 1);
+                       printf(", first %" PRIu64 " byte(s) of body:", body_len_printed - 1);
                        hex_and_ascii_print("\n\t ", cp + header_len + 1, body_len_printed - 1);
                        printf("\n");
                }
@@ -133,7 +135,7 @@ zmtp1_print_frame(const u_char *cp, const u_char *ep) {
        return cp + header_len + body_len_declared;
 
 trunc:
-       printf(" [|zmtp1]");
+       printf("%s", tstr);
        return ep;
 }
 
@@ -146,3 +148,69 @@ zmtp1_print(const u_char *cp, u_int len) {
                cp = zmtp1_print_frame(cp, ep);
 }
 
+/* The functions below decode a ZeroMQ datagram, supposedly stored in the "Data"
+ * field of an ODATA/RDATA [E]PGM packet. An excerpt from zmq_pgm(7) man page
+ * follows.
+ *
+ * In order for late joining consumers to be able to identify message
+ * boundaries, each PGM datagram payload starts with a 16-bit unsigned integer
+ * in network byte order specifying either the offset of the first message frame
+ * in the datagram or containing the value 0xFFFF if the datagram contains
+ * solely an intermediate part of a larger message.
+ *
+ * Note that offset specifies where the first message begins rather than the
+ * first message part. Thus, if there are trailing message parts at the
+ * beginning of the packet the offset ignores them and points to first initial
+ * message part in the packet.
+ */
+
+static const u_char *
+zmtp1_print_intermediate_part(const u_char *cp, const u_int len) {
+       u_int frame_offset;
+       u_int64_t remaining_len;
+
+       TCHECK2(*cp, 2);
+       frame_offset = EXTRACT_16BITS(cp);
+       printf("\n\t frame offset 0x%04x", frame_offset);
+       cp += 2;
+       remaining_len = snapend - cp; /* without the frame length */
+
+       if (frame_offset == 0xFFFF)
+               frame_offset = len - 2; /* always within the declared length */
+       else if (2 + frame_offset > len) {
+               printf(" (exceeds datagram declared length)");
+               goto trunc;
+       }
+
+       /* offset within declared length of the datagram */
+       if (frame_offset) {
+               printf("\n\t frame intermediate part, %u bytes", frame_offset);
+               if (frame_offset > remaining_len)
+                       printf(" (%"PRIu64" captured)", remaining_len);
+               if (vflag) {
+                       u_int64_t len_printed = MIN(frame_offset, remaining_len);
+
+                       if (vflag == 1)
+                               len_printed = MIN(VBYTES, len_printed);
+                       if (len_printed > 1) {
+                               printf(", first %"PRIu64" byte(s):", len_printed);
+                               hex_and_ascii_print("\n\t ", cp, len_printed);
+                               printf("\n");
+                       }
+               }
+       }
+       return cp + frame_offset;
+
+trunc:
+       printf("%s", tstr);
+       return cp + len;
+}
+
+void
+zmtp1_print_datagram(const u_char *cp, const u_int len) {
+       const u_char *ep = MIN(snapend, cp + len);
+
+       cp = zmtp1_print_intermediate_part(cp, len);
+       while (cp < ep)
+               cp = zmtp1_print_frame(cp, ep);
+}