X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ed85e20e4d6a27d5405f37366dd34b64c10a9211..0845bc813c1cc48b18cdefff0b387c110647463c:/print-zeromq.c diff --git a/print-zeromq.c b/print-zeromq.c index 0ef30517..410241e4 100644 --- a/print-zeromq.c +++ b/print-zeromq.c @@ -28,14 +28,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif #include -#include "interface.h" +#include "netdissect.h" #include "extract.h" static const char tstr[] = " [|zmtp1]"; @@ -76,7 +75,8 @@ static const char tstr[] = " [|zmtp1]"; */ static const u_char * -zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) { +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; @@ -139,7 +139,8 @@ trunc: } void -zmtp1_print(netdissect_options *ndo, const u_char *cp, u_int 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")); @@ -164,7 +165,8 @@ 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; uint64_t remaining_len; @@ -206,7 +208,8 @@ trunc: } void -zmtp1_print_datagram(netdissect_options *ndo, const u_char *cp, const u_int 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);