Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index 1f31163a0a0616d5afda61b7690a5f7b146af6a9..0ef30517bd7cc312faa2e8cda3a8b4810a0feea2 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -77,8 +77,8 @@ static const char tstr[] = " [|zmtp1]";
 
 static const u_char *
 zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
-       u_int64_t body_len_declared, body_len_captured, header_len;
-       u_int8_t flags;
+       uint64_t body_len_declared, body_len_captured, header_len;
+       uint8_t flags;
 
        ND_PRINT((ndo, "\n\t"));
        ND_TCHECK2(*cp, 1); /* length/0xFF */
@@ -109,7 +109,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
        ND_PRINT((ndo, ", flags 0x%02x", flags));
 
        if (ndo->ndo_vflag) {
-               u_int64_t body_len_printed = MIN(body_len_captured, body_len_declared);
+               uint64_t body_len_printed = min(body_len_captured, body_len_declared);
 
                ND_PRINT((ndo, " (%s|%s|%s|%s|%s|%s|%s|%s)",
                        flags & 0x80 ? "MBZ" : "-",
@@ -122,7 +122,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep) {
                        flags & 0x01 ? "MORE" : "-"));
 
                if (ndo->ndo_vflag == 1)
-                       body_len_printed = MIN(VBYTES + 1, body_len_printed);
+                       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));
                        hex_and_ascii_print(ndo, "\n\t ", cp + header_len + 1, body_len_printed - 1);
@@ -140,7 +140,7 @@ trunc:
 
 void
 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);
 
        ND_PRINT((ndo, ": ZMTP/1.0"));
        while (cp < ep)
@@ -166,7 +166,7 @@ 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) {
        u_int frame_offset;
-       u_int64_t remaining_len;
+       uint64_t remaining_len;
 
        ND_TCHECK2(*cp, 2);
        frame_offset = EXTRACT_16BITS(cp);
@@ -187,10 +187,10 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
                if (frame_offset > remaining_len)
                        ND_PRINT((ndo, " (%"PRIu64" captured)", remaining_len));
                if (ndo->ndo_vflag) {
-                       u_int64_t len_printed = min(frame_offset, remaining_len);
+                       uint64_t len_printed = min(frame_offset, remaining_len);
 
                        if (ndo->ndo_vflag == 1)
-                               len_printed = MIN(VBYTES, len_printed);
+                               len_printed = min(VBYTES, len_printed);
                        if (len_printed > 1) {
                                ND_PRINT((ndo, ", first %"PRIu64" byte(s):", len_printed));
                                hex_and_ascii_print(ndo, "\n\t ", cp, len_printed);