Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / ipproto.h

diff --git a/ipproto.h b/ipproto.h
index 1efb8557571dfc419b7d9994125fffb6d7c4184b..75def3d85f01b6e4a973f8a91d552072f57fbe1a 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -30,13 +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.2 2003-11-24 20:30:51 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[];
+
 #ifndef IPPROTO_IP
 #define        IPPROTO_IP              0               /* dummy for IP */
 #endif
@@ -58,12 +58,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
@@ -113,8 +116,8 @@
 #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
@@ -128,6 +131,12 @@
 #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