aboutsummaryrefslogtreecommitdiffstats
path: root/ipproto.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-03-05 20:11:36 +0000
committerGuy Harris <guy@alum.mit.edu>2001-03-05 20:11:36 +0000
commit3941a1e3a4a51328622a9680fe703c58a09f48b3 (patch)
tree20618a478f508b5d533da0879db49d94bb1aa958 /ipproto.c
parent63887cb8c83f19966523263172160f995fa1bcd6 (diff)
downloadwireshark-3941a1e3a4a51328622a9680fe703c58a09f48b3.tar.gz
wireshark-3941a1e3a4a51328622a9680fe703c58a09f48b3.tar.bz2
wireshark-3941a1e3a4a51328622a9680fe703c58a09f48b3.zip
Move the definition of IP_PROTO_IGRP to "packet-ip.h", and put an entry
for IGRP in the table in "ipproto.c". Get rid of a duplicate entry for TCP in the same table, and also get rid of the entry for IP_PROTO_IPV4 right after IP_PROTO_IPIP, as IP_PROTO_IPIP and IP_PROTO_IPV4 are both 4. svn path=/trunk/; revision=3106
Diffstat (limited to 'ipproto.c')
-rw-r--r--ipproto.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ipproto.c b/ipproto.c
index 370feba602..36f524a0e0 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
/* ipproto.c
* Routines for converting IPv4 protocol/v6 nxthdr field into string
*
- * $Id: ipproto.c,v 1.9 2000/08/11 13:35:31 deniel Exp $
+ * $Id: ipproto.c,v 1.10 2001/03/05 20:11:36 guy Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@@ -53,7 +53,8 @@
static const value_string ipproto_val[] = {
{ IP_PROTO_ICMP, "ICMP" },
{ IP_PROTO_IGMP, "IGMP" },
- { IP_PROTO_EIGRP, "IGRP/EIGRP" },
+ { IP_PROTO_EIGRP, "EIGRP" },
+ { IP_PROTO_IGRP, "IGRP" },
{ IP_PROTO_TCP, "TCP" },
{ IP_PROTO_UDP, "UDP" },
{ IP_PROTO_OSPF, "OSPF" },
@@ -65,8 +66,9 @@ static const value_string ipproto_val[] = {
{ IP_PROTO_IGMP, "IGMP" },
{ IP_PROTO_GGP, "GGP" },
{ IP_PROTO_IPIP, "IPIP" },
+#if 0
{ IP_PROTO_IPV4, "IPv4" },
- { IP_PROTO_TCP, "TCP" },
+#endif
{ IP_PROTO_EGP, "EGP" },
{ IP_PROTO_PUP, "PUP" },
{ IP_PROTO_UDP, "UDP" },