diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-01-22 08:54:08 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-01-22 08:54:08 +0000 |
| commit | a4e137f630823d36bcfb8ab402556ca9e6d0d734 (patch) | |
| tree | 8617f6910eca8b6064b548f3d9cd6357d07843f1 /packet-icmpv6.c | |
| parent | c57c848dfa1f7061ada20fa88ad6eac33ad1ea7c (diff) | |
Remove more "CHECK_DISPLAY_AS_DATA()" calls and "pinfo->current_proto ="
statements.
Move the setting of the Protocol column in various dissectors before
anything is fetched from the packet, and also clear the Info column at
that point in those and some other dissectors, so that if an exception
is thrown, the columns don't reflect the previous protocol.
svn path=/trunk/; revision=2932
Diffstat (limited to 'packet-icmpv6.c')
| -rw-r--r-- | packet-icmpv6.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/packet-icmpv6.c b/packet-icmpv6.c index f73c5e640d..8966b5d879 100644 --- a/packet-icmpv6.c +++ b/packet-icmpv6.c @@ -1,7 +1,7 @@ /* packet-icmpv6.c * Routines for ICMPv6 packet disassembly * - * $Id: packet-icmpv6.c,v 1.34 2001/01/09 06:31:36 guy Exp $ + * $Id: packet-icmpv6.c,v 1.35 2001/01/22 08:54:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -732,8 +732,6 @@ dissect_icmpv6(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) guint32 phdr[2]; guint16 cksum, computed_cksum; - OLD_CHECK_DISPLAY_AS_DATA(proto_icmpv6, pd, offset, fd, tree); - dp = (struct icmp6_hdr *)&pd[offset]; codename = typename = colcodename = coltypename = "Unknown"; len = sizeof(*dp); |