the failed/passed count was not kept in the right place

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index 6e5e9dc8106a3f25d1624c9b4be1679f9c002d98..ac61056a8db6418b58e93556d1b590dda38a80ce 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -81,21 +81,21 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        ND_PRINT("\n\t");
        ND_TCHECK_1(cp); /* length/0xFF */
 
-       if (EXTRACT_U_1(cp) != 0xFF) {
+       if (GET_U_1(cp) != 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)
@@ -120,7 +120,6 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
                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");
                }
        }
 
@@ -173,7 +172,7 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
        uint64_t 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 */
@@ -198,7 +197,6 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
                        if (len_printed > 1) {
                                ND_PRINT(", first %"PRIu64" byte(s):", len_printed);
                                hex_and_ascii_print(ndo, "\n\t ", cp, len_printed);
-                               ND_PRINT("\n");
                        }
                }
        }