]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-zeromq.c
CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10
[tcpdump] / print-zeromq.c
index 05dc0c472f9f13e047dbc8f1ea6b87202c07bae4..820104758a2b27148c2bc6cfbdf259d26487dfc8 100644 (file)
  */
 
 /* \summary: ZeroMQ Message Transport Protocol (ZMTP) printer */
+/* specification: https://rfc.zeromq.org/spec/13/ */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
 #include "netdissect.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.
  */
 #define VBYTES 128
 
+static const struct tok flags_bm[] = {
+       { 0x01, "MORE"  },
+       { 0x02, "R1" },
+       { 0x04, "R2" },
+       { 0x08, "R3" },
+       { 0x10, "R4" },
+       { 0x20, "R5" },
+       { 0x40, "R6" },
+       { 0x80, "R7" },
+       { 0, NULL }
+};
+
 /*
  * Below is an excerpt from the "13/ZMTP" specification:
  *
@@ -80,23 +90,22 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        uint8_t flags;
 
        ND_PRINT("\n\t");
-       ND_TCHECK_1(cp); /* length/0xFF */
 
-       if (EXTRACT_U_1(cp) != 0xFF) {
+       if (GET_U_1(cp) != 0xFF) {      /* length/0xFF */
                header_len = 1; /* length */
-               body_len_declared = EXTRACT_U_1(cp);
+               body_len_declared = GET_U_1(cp);
                ND_PRINT(" frame flags+body  (8-bit) length %" PRIu64, body_len_declared);
        } else {
                header_len = 1 + 8; /* 0xFF, length */
                ND_PRINT(" frame flags+body (64-bit) length");
                ND_TCHECK_LEN(cp, header_len); /* 0xFF, length */
-               body_len_declared = EXTRACT_BE_U_8(cp + 1);
+               body_len_declared = GET_BE_U_8(cp + 1);
                ND_PRINT(" %" PRIu64, body_len_declared);
        }
        if (body_len_declared == 0)
                return cp + header_len; /* skip to the next frame */
        ND_TCHECK_LEN(cp, header_len + 1); /* ..., flags */
-       flags = EXTRACT_U_1(cp + header_len);
+       flags = GET_U_1(cp + header_len);
 
        body_len_captured = ep - cp - header_len;
        if (body_len_declared > body_len_captured)
@@ -104,24 +113,14 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        ND_PRINT(", flags 0x%02x", flags);
 
        if (ndo->ndo_vflag) {
-               uint64_t body_len_printed = min(body_len_captured, body_len_declared);
-
-               ND_PRINT(" (%s|%s|%s|%s|%s|%s|%s|%s)",
-                       flags & 0x80 ? "MBZ" : "-",
-                       flags & 0x40 ? "MBZ" : "-",
-                       flags & 0x20 ? "MBZ" : "-",
-                       flags & 0x10 ? "MBZ" : "-",
-                       flags & 0x08 ? "MBZ" : "-",
-                       flags & 0x04 ? "MBZ" : "-",
-                       flags & 0x02 ? "MBZ" : "-",
-                       flags & 0x01 ? "MORE" : "-");
+               uint64_t body_len_printed = ND_MIN(body_len_captured, body_len_declared);
 
+               ND_PRINT(" (%s)", bittok2str(flags_bm, "none", flags));
                if (ndo->ndo_vflag == 1)
-                       body_len_printed = min(VBYTES + 1, body_len_printed);
+                       body_len_printed = ND_MIN(VBYTES + 1, body_len_printed);
                if (body_len_printed > 1) {
                        ND_PRINT(", first %" PRIu64 " byte(s) of body:", body_len_printed - 1);
                        hex_and_ascii_print(ndo, "\n\t ", cp + header_len + 1, body_len_printed - 1);
-                       ND_PRINT("\n");
                }
        }
 
@@ -136,15 +135,15 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return cp + body_len_declared;
 
 trunc:
-       ND_PRINT("%s", tstr);
-       return ep;
+       nd_trunc_longjmp(ndo);
 }
 
 void
 zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len)
 {
-       const u_char *ep = min(ndo->ndo_snapend, cp + len);
+       const u_char *ep = ND_MIN(ndo->ndo_snapend, cp + len);
 
+       ndo->ndo_protocol = "zmtp1";
        ND_PRINT(": ZMTP/1.0");
        while (cp < ep)
                cp = zmtp1_print_frame(ndo, cp, ep);
@@ -170,13 +169,12 @@ static const u_char *
 zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
        u_int frame_offset;
-       uint64_t remaining_len;
+       u_int remaining_len;
 
-       ND_TCHECK_2(cp);
-       frame_offset = EXTRACT_BE_U_2(cp);
+       frame_offset = GET_BE_U_2(cp);
        ND_PRINT("\n\t frame offset 0x%04x", frame_offset);
        cp += 2;
-       remaining_len = ndo->ndo_snapend - cp; /* without the frame length */
+       remaining_len = ND_BYTES_AVAILABLE_AFTER(cp); /* without the frame length */
 
        if (frame_offset == 0xFFFF)
                frame_offset = len - 2; /* always within the declared length */
@@ -189,31 +187,30 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
        if (frame_offset) {
                ND_PRINT("\n\t frame intermediate part, %u bytes", frame_offset);
                if (frame_offset > remaining_len)
-                       ND_PRINT(" (%"PRIu64" captured)", remaining_len);
+                       ND_PRINT(" (%u captured)", remaining_len);
                if (ndo->ndo_vflag) {
-                       uint64_t len_printed = min(frame_offset, remaining_len);
+                       u_int len_printed = ND_MIN(frame_offset, remaining_len);
 
                        if (ndo->ndo_vflag == 1)
-                               len_printed = min(VBYTES, len_printed);
+                               len_printed = ND_MIN(VBYTES, len_printed);
                        if (len_printed > 1) {
-                               ND_PRINT(", first %"PRIu64" byte(s):", len_printed);
+                               ND_PRINT(", first %u byte(s):", len_printed);
                                hex_and_ascii_print(ndo, "\n\t ", cp, len_printed);
-                               ND_PRINT("\n");
                        }
                }
        }
        return cp + frame_offset;
 
 trunc:
-       ND_PRINT("%s", tstr);
-       return cp + len;
+       nd_trunc_longjmp(ndo);
 }
 
 void
 zmtp1_datagram_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
-       const u_char *ep = min(ndo->ndo_snapend, cp + len);
+       const u_char *ep = ND_MIN(ndo->ndo_snapend, cp + len);
 
+       ndo->ndo_protocol = "zmtp1";
        cp = zmtp1_print_intermediate_part(ndo, cp, len);
        while (cp < ep)
                cp = zmtp1_print_frame(ndo, cp, ep);