CARP: Print the protocol name before any GET_()

This change will print the protocol name even if the first octet is
truncated.
Use nd_print_protocol_caps().

(cherry picked from commit f4a7688fecc925c11e9c3cb0df5514dda72a252e)

diff --git a/print-carp.c b/print-carp.c
index 75f506685f56a0369aff76676af3817709afba61..bef07d0b8ec0b6a8c6534e5f5ea65564344f0fc2 100644 (file)
--- a/print-carp.c
+++ b/print-carp.c
@@ -52,13 +52,14 @@ carp_print(netdissect_options *ndo, const u_char *bp, u_int len, u_int ttl)
        const char *type_s;
 
        ndo->ndo_protocol = "carp";
+       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)