summaryrefslogtreecommitdiffstats
path: root/print-carp.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:52:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:52:32 +0000
commit19d738d1692ee8b11eb2de0f9995732b32cf6bac (patch)
tree35501236837919acfbf69e867f25e6830ee9301d /print-carp.c
parentAdding debian version 4.99.4-4. (diff)
downloadtcpdump-19d738d1692ee8b11eb2de0f9995732b32cf6bac.tar.xz
tcpdump-19d738d1692ee8b11eb2de0f9995732b32cf6bac.zip
Merging upstream version 4.99.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'print-carp.c')
-rw-r--r--print-carp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/print-carp.c b/print-carp.c
index 75f5066..a073908 100644
--- 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,13 +50,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)