From: Denis Ovsienko <denis@ovsienko.info>
Date: Sun, 27 Aug 2017 11:19:59 +0000 (+0100)
Subject: Dismiss unused IPPROTO_CARP.
X-Git-Tag: tcpdump-4.99-bp~2028
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/1b17a8cc5e2f73c17a11b07ada38e2cb173975a7

Dismiss unused IPPROTO_CARP.

In ipproto_values[] IPPROTO_CARP never matched because of IPPROTO_VRRP,
which matched earlier. Remove the array element and the macro and leave
some comments instead.
---

diff --git a/ipproto.c b/ipproto.c
index 74a75d45..8083da51 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -46,11 +46,10 @@ const struct tok ipproto_values[] = {
     { IPPROTO_OSPF, "OSPF" },
     { IPPROTO_PIM, "PIM" },
     { IPPROTO_IPCOMP, "Compressed IP" },
-    { IPPROTO_VRRP, "VRRP" },
+    { IPPROTO_VRRP, "VRRP" }, /* See also CARP. */
     { IPPROTO_PGM, "PGM" },
     { IPPROTO_SCTP, "SCTP" },
     { IPPROTO_MOBILITY, "Mobility" },
-    { IPPROTO_CARP, "CARP" },
     { 0, NULL }
 };
 
diff --git a/ipproto.h b/ipproto.h
index 75def3d8..ac6fd2cb 100644
--- a/ipproto.h
+++ b/ipproto.h
@@ -129,10 +129,7 @@ extern const struct tok ipproto_values[];
 #define IPPROTO_IPCOMP		108
 #endif
 #ifndef IPPROTO_VRRP
-#define IPPROTO_VRRP		112
-#endif
-#ifndef IPPROTO_CARP
-#define IPPROTO_CARP		112
+#define IPPROTO_VRRP		112 /* See also CARP. */
 #endif
 #ifndef IPPROTO_PGM
 #define IPPROTO_PGM             113