From eb1accc762f7320bcb5727f108c8a81c7c63bfba Mon Sep 17 00:00:00 2001
From: Bill Fenner <fenner@FreeBSD.org>
Date: Tue, 26 Nov 1996 01:43:20 +0000
Subject: [PATCH] LBL chose to use IPPROTO_ENCAP to represent IP proto 4
encapsulation as performed by the multicast kernel modifications. However,
BSD already had IPPROTO_ENCAP defined as 98 (RFC 1241 encapsulation).
This changes the use of IPPROTO_ENCAP to IPPROTO_IPIP, which is
the BSD name for IP proto 4.
---
contrib/tcpdump/print-ip.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index 7f9e44b60a38..2f493520fac3 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/contrib/tcpdump/print-ip.c
@@ -445,10 +445,10 @@ ip_print(register const u_char *bp, register u_int length)
igmp_print(cp, len, (const u_char *)ip);
break;
-#ifndef IPPROTO_ENCAP
-#define IPPROTO_ENCAP 4
+#ifndef IPPROTO_IPIP
+#define IPPROTO_IPIP 4
#endif
- case IPPROTO_ENCAP:
+ case IPPROTO_IPIP:
/* ip-in-ip encapsulation */
if (vflag)
(void)printf("%s > %s: ",