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 587ee3e4e7c7cb6e12c8b26fe103cb6559d96089..ac61056a8db6418b58e93556d1b590dda38a80ce 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -28,15 +28,14 @@
 /* \summary: ZeroMQ Message Transport Protocol (ZMTP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: ZeroMQ Message Transport Protocol (ZMTP) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "extract.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.
 
 /* Maximum number of ZMTP/1.0 frame body bytes (without the flags) to dump in
  * hex and ASCII under a single "-v" flag.


@@ -82,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 */
 
        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 */
                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 */
                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 */
                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)
 
        body_len_captured = ep - cp - header_len;
        if (body_len_declared > body_len_captured)


@@ -121,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);
                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,7 +134,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return cp + body_len_declared;
 
 trunc:
        return cp + body_len_declared;
 
 trunc:

-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);

        return ep;
 }
 
        return ep;
 }
 


@@ -145,6 +143,7 @@ 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 = 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);
        ND_PRINT(": ZMTP/1.0");
        while (cp < ep)
                cp = zmtp1_print_frame(ndo, cp, ep);


@@ -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);
        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 */
        ND_PRINT("\n\t frame offset 0x%04x", frame_offset);
        cp += 2;
        remaining_len = ndo->ndo_snapend - cp; /* without the frame length */


@@ -198,14 +197,13 @@ 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);
                        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");

                        }
                }
        }
        return cp + frame_offset;
 
 trunc:
                        }
                }
        }
        return cp + frame_offset;
 
 trunc:

-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);

        return cp + len;
 }
 
        return cp + len;
 }
 


@@ -214,6 +212,7 @@ 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 = 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);
        cp = zmtp1_print_intermediate_part(ndo, cp, len);
        while (cp < ep)
                cp = zmtp1_print_frame(ndo, cp, ep);