diff options
| author | Guy Harris <guy@alum.mit.edu> | 1999-10-13 06:47:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 1999-10-13 06:47:49 +0000 |
| commit | 93d58bf8242abd9026cecd2da313ac1de30d3fbe (patch) | |
| tree | 5f38b50664f85709211104e3cca23e8f2d3174b5 /packet-ipv6.c | |
| parent | 98ce0fcfabac47d81a2d3513b751b3174b6101f3 (diff) | |
| download | wireshark-93d58bf8242abd9026cecd2da313ac1de30d3fbe.tar.gz | |
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-ipv6.c')
| -rw-r--r-- | packet-ipv6.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/packet-ipv6.c b/packet-ipv6.c index 298cd09e84..20fd14d583 100644 --- a/packet-ipv6.c +++ b/packet-ipv6.c @@ -1,7 +1,7 @@ /* packet-ipv6.c * Routines for IPv6 packet disassembly * - * $Id: packet-ipv6.c,v 1.17 1999/10/13 02:04:04 guy Exp $ + * $Id: packet-ipv6.c,v 1.18 1999/10/13 06:47:47 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -178,8 +178,8 @@ dissect_opts(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, case IP6OPT_JUMBO: if (p[1] == 4) { proto_tree_add_text(dstopt_tree, p - pd, p[1] + 2, - "Jumbo payload: %u (%d bytes)", *(guint32 *)&p[2], - p[1] + 2); + "Jumbo payload: %u (%d bytes)", + ntohl(*(guint32 *)&p[2]), p[1] + 2); } else { proto_tree_add_text(dstopt_tree, p - pd, p[1] + 2, "Jumbo payload: invalid length (%d bytes)", @@ -364,6 +364,9 @@ again: case IP_PROTO_UDP: dissect_udp(pd, offset, fd, tree); break; + case IP_PROTO_PIM: + dissect_pim(pd, offset, fd, tree); + break; default: if (check_col(fd, COL_INFO)) { col_add_fstr(fd, COL_INFO, "Unknown IPv6 protocol (0x%02x)", |