Handle very large -f files by rejecting them.

[tcpdump] / ipproto.h

diff --git a/ipproto.h b/ipproto.h
index 8fc927862ce8cbeb06c8873b278ea495daff59b4..ed327857bc93b94581001a152907abd146a0a5f7 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -30,13 +30,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ipproto.h,v 1.1 2003-06-07 11:57:52 guy Exp $ (LBL)
- *
  * From:
  *     @(#)in.h        8.3 (Berkeley) 1/3/94
  * $FreeBSD: src/sys/netinet/in.h,v 1.38.2.3 1999/08/29 16:29:34 peter Exp $
  */
 
+extern const struct tok ipproto_values[];
+extern const char *netdb_protoname (const nd_uint8_t);
+
 #ifndef IPPROTO_IP
 #define        IPPROTO_IP              0               /* dummy for IP */
 #endif
@@ -58,12 +59,15 @@
 #ifndef IPPROTO_EGP
 #define        IPPROTO_EGP             8               /* exterior gateway protocol */
 #endif
-#ifndef IPPROTO_IGRP
-#define IPPROTO_IGRP           9
+#ifndef IPPROTO_PIGP
+#define IPPROTO_PIGP           9
 #endif
 #ifndef IPPROTO_UDP
 #define        IPPROTO_UDP             17              /* user datagram protocol */
 #endif
+#ifndef IPPROTO_DCCP
+#define        IPPROTO_DCCP            33              /* datagram congestion control protocol */
+#endif
 #ifndef IPPROTO_IPV6
 #define IPPROTO_IPV6           41
 #endif
@@ -97,14 +101,24 @@
 #ifndef IPPROTO_DSTOPTS
 #define IPPROTO_DSTOPTS                60              /* IPv6 destination options */
 #endif
-#ifndef IPPROTO_MOBILITY
-#define IPPROTO_MOBILITY       62
+#ifndef IPPROTO_MOBILITY_OLD
+/*
+ * The current Protocol Numbers list says that the IP protocol number for
+ * mobility headers is 135; it cites draft-ietf-mobileip-ipv6-24, but
+ * that draft doesn't actually give a number.
+ *
+ * It appears that 62 used to be used, even though that's assigned to
+ * a protocol called CFTP; however, the only reference for CFTP is a
+ * Network Message from BBN back in 1982, so, for now, we support 62,
+ * as well as 135, as a protocol number for mobility headers.
+ */
+#define IPPROTO_MOBILITY_OLD   62
 #endif
 #ifndef IPPROTO_ND
 #define        IPPROTO_ND              77              /* Sun net disk proto (temp.) */
 #endif
-#ifndef IPPROTO_IGRP
-#define        IPPROTO_IGRP            88              /* Cisco/GXS IGRP */
+#ifndef IPPROTO_EIGRP
+#define        IPPROTO_EIGRP           88              /* Cisco/GXS IGRP */
 #endif
 #ifndef IPPROTO_OSPF
 #define IPPROTO_OSPF           89
@@ -118,6 +132,15 @@
 #ifndef IPPROTO_VRRP
 #define IPPROTO_VRRP           112
 #endif
+#ifndef IPPROTO_CARP
+#define IPPROTO_CARP           112
+#endif
+#ifndef IPPROTO_PGM
+#define IPPROTO_PGM             113
+#endif
 #ifndef IPPROTO_SCTP
 #define IPPROTO_SCTP           132
 #endif
+#ifndef IPPROTO_MOBILITY
+#define IPPROTO_MOBILITY       135
+#endif