aboutsummaryrefslogtreecommitdiffstats
path: root/packet-ip.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>1999-10-13 06:47:49 +0000
committerGuy Harris <guy@alum.mit.edu>1999-10-13 06:47:49 +0000
commit93d58bf8242abd9026cecd2da313ac1de30d3fbe (patch)
tree5f38b50664f85709211104e3cca23e8f2d3174b5 /packet-ip.c
parent98ce0fcfabac47d81a2d3513b751b3174b6101f3 (diff)
Jun-ichiro itojun Hagino's code for PIM, and some fixes from him as
well. Add some more protocols to the list of value/string pairs for IP protocol types. svn path=/trunk/; revision=822
Diffstat (limited to 'packet-ip.c')
-rw-r--r--packet-ip.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/packet-ip.c b/packet-ip.c
index 0775aaa674..b019a6cf09 100644
--- a/packet-ip.c
+++ b/packet-ip.c
@@ -1,7 +1,7 @@
/* packet-ip.c
* Routines for IP and miscellaneous IP protocol packet disassembly
*
- * $Id: packet-ip.c,v 1.51 1999/10/12 06:20:08 gram Exp $
+ * $Id: packet-ip.c,v 1.52 1999/10/13 06:47:44 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -639,6 +639,12 @@ static const value_string proto_vals[] = { {IP_PROTO_ICMP, "ICMP"},
{IP_PROTO_TCP, "TCP" },
{IP_PROTO_UDP, "UDP" },
{IP_PROTO_OSPF, "OSPF"},
+ {IP_PROTO_RSVP, "RSVP"},
+ {IP_PROTO_AH, "AH" },
+ {IP_PROTO_GRE, "GRE" },
+ {IP_PROTO_ESP, "ESP" },
+ {IP_PROTO_IPV6, "IPv6"},
+ {IP_PROTO_PIM, "PIM" },
{0, NULL } };
static const value_string precedence_vals[] = {
@@ -704,6 +710,7 @@ dissect_ip(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) {
case IP_PROTO_ESP:
case IP_PROTO_AH:
case IP_PROTO_IPV6:
+ case IP_PROTO_PIM:
/* Names are set in the associated dissect_* routines */
break;
default:
@@ -846,7 +853,7 @@ again:
case IP_PROTO_TCP:
dissect_tcp(pd, offset, fd, tree);
break;
- case IP_PROTO_UDP:
+ case IP_PROTO_UDP:
dissect_udp(pd, offset, fd, tree);
break;
case IP_PROTO_OSPF:
@@ -869,6 +876,9 @@ again:
case IP_PROTO_IPV6:
dissect_ipv6(pd, offset, fd, tree);
break;
+ case IP_PROTO_PIM:
+ dissect_pim(pd, offset, fd, tree);
+ break;
default:
dissect_data(pd, offset, fd, tree);
break;