diff options
author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-07 11:47:30 +0100 |
---|---|---|
committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2018-01-07 13:36:41 +0100 |
commit | e2982e7f6f0b624a773ec5a58885ee80fab46d34 (patch) | |
tree | 52c8e511ccaff8ef09dc3337b213273865522162 /print-zeromq.c | |
parent | 8ab5c3a4e75a3ce8da691cd6ca6a9945082827af (diff) | |
download | tcpdump-e2982e7f6f0b624a773ec5a58885ee80fab46d34.tar.gz |
Update ND_PRINT() as a variadic macro
Diffstat (limited to 'print-zeromq.c')
-rw-r--r-- | print-zeromq.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/print-zeromq.c b/print-zeromq.c index e43d0717..587ee3e4 100644 --- a/print-zeromq.c +++ b/print-zeromq.c @@ -79,19 +79,19 @@ 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_PRINT("\n\t"); ND_TCHECK_1(cp); /* length/0xFF */ if (EXTRACT_U_1(cp) != 0xFF) { header_len = 1; /* length */ body_len_declared = EXTRACT_U_1(cp); - ND_PRINT((ndo, " frame flags+body (8-bit) length %" PRIu64, body_len_declared)); + ND_PRINT(" frame flags+body (8-bit) length %" PRIu64, body_len_declared); } else { header_len = 1 + 8; /* 0xFF, length */ - ND_PRINT((ndo, " frame flags+body (64-bit) 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); - ND_PRINT((ndo, " %" PRIu64, body_len_declared)); + ND_PRINT(" %" PRIu64, body_len_declared); } if (body_len_declared == 0) return cp + header_len; /* skip to the next frame */ @@ -100,13 +100,13 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) body_len_captured = ep - cp - header_len; if (body_len_declared > body_len_captured) - ND_PRINT((ndo, " (%" PRIu64 " captured)", body_len_captured)); - ND_PRINT((ndo, ", flags 0x%02x", flags)); + ND_PRINT(" (%" PRIu64 " captured)", body_len_captured); + ND_PRINT(", flags 0x%02x", flags); if (ndo->ndo_vflag) { uint64_t body_len_printed = min(body_len_captured, body_len_declared); - ND_PRINT((ndo, " (%s|%s|%s|%s|%s|%s|%s|%s)", + ND_PRINT(" (%s|%s|%s|%s|%s|%s|%s|%s)", flags & 0x80 ? "MBZ" : "-", flags & 0x40 ? "MBZ" : "-", flags & 0x20 ? "MBZ" : "-", @@ -114,14 +114,14 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) flags & 0x08 ? "MBZ" : "-", flags & 0x04 ? "MBZ" : "-", flags & 0x02 ? "MBZ" : "-", - flags & 0x01 ? "MORE" : "-")); + flags & 0x01 ? "MORE" : "-"); if (ndo->ndo_vflag == 1) 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)); + 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((ndo, "\n")); + ND_PRINT("\n"); } } @@ -136,7 +136,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) return cp + body_len_declared; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -145,7 +145,7 @@ 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")); + ND_PRINT(": ZMTP/1.0"); while (cp < ep) cp = zmtp1_print_frame(ndo, cp, ep); } @@ -174,38 +174,38 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u ND_TCHECK_2(cp); frame_offset = EXTRACT_BE_U_2(cp); - ND_PRINT((ndo, "\n\t frame offset 0x%04x", frame_offset)); + ND_PRINT("\n\t frame offset 0x%04x", frame_offset); cp += 2; remaining_len = ndo->ndo_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) { - ND_PRINT((ndo, " (exceeds datagram declared length)")); + ND_PRINT(" (exceeds datagram declared length)"); goto trunc; } /* offset within declared length of the datagram */ if (frame_offset) { - ND_PRINT((ndo, "\n\t frame intermediate part, %u bytes", frame_offset)); + ND_PRINT("\n\t frame intermediate part, %u bytes", frame_offset); if (frame_offset > remaining_len) - ND_PRINT((ndo, " (%"PRIu64" captured)", remaining_len)); + ND_PRINT(" (%"PRIu64" captured)", remaining_len); if (ndo->ndo_vflag) { uint64_t len_printed = min(frame_offset, remaining_len); if (ndo->ndo_vflag == 1) len_printed = min(VBYTES, len_printed); if (len_printed > 1) { - ND_PRINT((ndo, ", first %"PRIu64" byte(s):", len_printed)); + ND_PRINT(", first %"PRIu64" byte(s):", len_printed); hex_and_ascii_print(ndo, "\n\t ", cp, len_printed); - ND_PRINT((ndo, "\n")); + ND_PRINT("\n"); } } } return cp + frame_offset; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return cp + len; } |