Add program_name field in the netdissect_options structure

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index b2cf6db4c3136ec2cdc9ac725e7161d2b21aaa32..410241e4dc03601b3adfbbd27a552324c380159f 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -75,9 +75,10 @@ static const char tstr[] = " [|zmtp1]";
  */
 
 static const u_char *
-zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
-       u_int64_t body_len_declared, body_len_captured, header_len;
-       u_int8_t flags;
+zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
+{
+       uint64_t body_len_declared, body_len_captured, header_len;
+       uint8_t flags;
 
        ND_PRINT((ndo, "\n\t"));
        ND_TCHECK2(*cp, 1); /* length/0xFF */
@@ -108,7 +109,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
        ND_PRINT((ndo, ", flags 0x%02x", flags));
 
        if (ndo->ndo_vflag) {
-               u_int64_t body_len_printed = MIN(body_len_captured, body_len_declared);
+               uint64_t body_len_printed = min(body_len_captured, body_len_declared);
 
                ND_PRINT((ndo, " (%s|%s|%s|%s|%s|%s|%s|%s)",
                        flags & 0x80 ? "MBZ" : "-",
@@ -121,7 +122,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
                        flags & 0x01 ? "MORE" : "-"));
 
                if (ndo->ndo_vflag == 1)
-                       body_len_printed = MIN(VBYTES + 1, body_len_printed);
+                       body_len_printed = min(VBYTES + 1, body_len_printed);
                if (body_len_printed > 1) {
                        ND_PRINT((ndo, ", 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);
@@ -138,8 +139,9 @@ trunc:
 }
 
 void
-zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len) {
-       const u_char *ep = MIN(ndo->ndo_snapend, cp + len);
+zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len)
+{
+       const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
        ND_PRINT((ndo, ": ZMTP/1.0"));
        while (cp < ep)
@@ -163,9 +165,10 @@ zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int len) {
  */
 
 static const u_char *
-zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len) {
+zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u_int len)
+{
        u_int frame_offset;
-       u_int64_t remaining_len;
+       uint64_t remaining_len;
 
        ND_TCHECK2(*cp, 2);
        frame_offset = EXTRACT_16BITS(cp);
@@ -186,10 +189,10 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
                if (frame_offset > remaining_len)
                        ND_PRINT((ndo, " (%"PRIu64" captured)", remaining_len));
                if (ndo->ndo_vflag) {
-                       u_int64_t len_printed = MIN(frame_offset, remaining_len);
+                       uint64_t len_printed = min(frame_offset, remaining_len);
 
                        if (ndo->ndo_vflag == 1)
-                               len_printed = MIN(VBYTES, len_printed);
+                               len_printed = min(VBYTES, len_printed);
                        if (len_printed > 1) {
                                ND_PRINT((ndo, ", first %"PRIu64" byte(s):", len_printed));
                                hex_and_ascii_print(ndo, "\n\t ", cp, len_printed);
@@ -205,8 +208,9 @@ trunc:
 }
 
 void
-zmtp1_print_datagram(netdissect_options *ndo, const u_char *cp, const u_int len) {
-       const u_char *ep = MIN(ndo->ndo_snapend, cp + len);
+zmtp1_print_datagram(netdissect_options *ndo, const u_char *cp, const u_int len)
+{
+       const u_char *ep = min(ndo->ndo_snapend, cp + len);
 
        cp = zmtp1_print_intermediate_part(ndo, cp, len);
        while (cp < ep)