Fixed some warnings, added print-zep.c to CMakeLists

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index 05dc0c472f9f13e047dbc8f1ea6b87202c07bae4..6e5e9dc8106a3f25d1624c9b4be1679f9c002d98 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -36,7 +36,6 @@
 #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.
@@ -136,7 +135,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        return cp + body_len_declared;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return ep;
 }
 
@@ -145,6 +144,7 @@ zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int 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);
@@ -205,7 +205,7 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
        return cp + frame_offset;
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return cp + len;
 }
 
@@ -214,6 +214,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);
 
+       ndo->ndo_protocol = "zmtp1";
        cp = zmtp1_print_intermediate_part(ndo, cp, len);
        while (cp < ep)
                cp = zmtp1_print_frame(ndo, cp, ep);