Avoid collison with error(), clean up code a bit.

[tcpdump] / ipproto.h

diff --git a/ipproto.h b/ipproto.h
index 6ca1679d3b96328e67edf3bc86dbbc33b33da036..75def3d85f01b6e4a973f8a91d552072f57fbe1a 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -30,14 +30,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ipproto.h,v 1.4 2004-04-28 22:02:23 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 struct tok ipproto_values[];
+extern const struct tok ipproto_values[];
 
 #ifndef IPPROTO_IP
 #define        IPPROTO_IP              0               /* dummy for IP */
@@ -66,6 +64,9 @@ extern struct tok ipproto_values[];
 #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
@@ -130,6 +131,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