CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / print-carp.c

diff --git a/print-carp.c b/print-carp.c
index 6ce7056682c95e2fbdcb3579711c28daa13a2455..a073908d7600799b8a91b977ab2aa34503ca41d8 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -36,9 +36,7 @@
 
 /* \summary: Common Address Redundancy Protocol (CARP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -52,20 +50,18 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl)
        const char *type_s;
 
        ndo->ndo_protocol = "carp";
-       ND_TCHECK_1(bp);
+       nd_print_protocol_caps(ndo);
        version = (GET_U_1(bp) & 0xf0) >> 4;
        type = GET_U_1(bp) & 0x0f;
        if (type == 1)
                type_s = "advertise";
        else
                type_s = "unknown";
-       ND_PRINT("CARPv%u-%s %u: ", version, type_s, len);
+       ND_PRINT("v%u-%s %u: ", version, type_s, len);
        if (ttl != 255)
                ND_PRINT("[ttl=%u!] ", ttl);
        if (version != 2 || type != 1)
                return;
-       ND_TCHECK_1(bp + 2);
-       ND_TCHECK_1(bp + 5);
        ND_PRINT("vhid=%u advbase=%u advskew=%u authlen=%u ",
            GET_U_1(bp + 1), GET_U_1(bp + 5), GET_U_1(bp + 2),
            GET_U_1(bp + 3));
@@ -78,8 +74,4 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl)
                                GET_BE_U_2(bp + 6));
        }
        ND_PRINT("counter=%" PRIu64, GET_BE_U_8(bp + 8));
-
-       return;
-trunc:
-       nd_print_trunc(ndo);
 }