summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCan Erkin Acar <canacar@cvs.openbsd.org>2007-10-04 18:38:30 +0000
committerCan Erkin Acar <canacar@cvs.openbsd.org>2007-10-04 18:38:30 +0000
commit7bb75155878c2fef5a262b4df15f6b1626b8cfb6 (patch)
treec6d5f76a65c3021282ce5cf962f980f5d63b4639
parent6201e269cecd1123f4c298ef288cb4fa3f3a0b49 (diff)
Handle CARP for IPv6. Reported and tested by todd@
ok todd@, henning@
-rw-r--r--usr.sbin/tcpdump/print-ip6.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c
index 248c49463c3..9063102a0e0 100644
--- a/usr.sbin/tcpdump/print-ip6.c
+++ b/usr.sbin/tcpdump/print-ip6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print-ip6.c,v 1.9 2007/06/27 18:15:25 canacar Exp $ */
+/* $OpenBSD: print-ip6.c,v 1.10 2007/10/04 18:38:29 canacar Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994
@@ -187,6 +187,16 @@ ip6_print(register const u_char *bp, register int length)
(void)printf("no next header");
goto end;
+#ifndef IPPROTO_CARP
+#define IPPROTO_CARP 112
+#endif
+ case IPPROTO_CARP:
+ if (packettype == PT_VRRP)
+ vrrp_print(cp, len, ip6->ip6_hlim);
+ else
+ carp_print(cp, len, ip6->ip6_hlim);
+ break;
+
default:
(void)printf("ip-proto-%d %d", ip6->ip6_nxt, len);
goto end;