Handle very large -f files by rejecting them.

[tcpdump] / ipproto.h

diff --git a/ipproto.h b/ipproto.h
index e9f090ef199730f651370674e2bbceafa6697972..ed327857bc93b94581001a152907abd146a0a5f7 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -30,14 +30,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ipproto.h,v 1.3 2004-04-26 17:49:44 hannes 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 struct tok ipproto_values[];
+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 */
@@ -60,12 +59,15 @@ extern struct tok ipproto_values[];
 #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
@@ -108,7 +110,7 @@ extern struct tok ipproto_values[];
  * 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,
- * aas well as 135, as a protocol number for mobility headers.
+ * as well as 135, as a protocol number for mobility headers.
  */
 #define IPPROTO_MOBILITY_OLD   62
 #endif
@@ -130,6 +132,12 @@ extern struct tok ipproto_values[];
 #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