From 039c0ccac0536e5359cb132ee83edbc3cf513f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sun, 18 Jul 2010 11:07:04 +0000 Subject: [PATCH] Show the reserved values in type 135, 137 and 143 in the packet tree. This fixes the issues in bug 5018. svn path=/trunk/; revision=33561 --- epan/dissectors/packet-icmpv6.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 7f9ef3490f..dff1ef57f0 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1844,6 +1844,8 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 nbRecords; nbRecords = tvb_get_ntohs( tvb, offset+4+2 ); + proto_tree_add_text( icmp6_tree, tvb, offset+4, 2, "Reserved: %d (Should always be zero)", + tvb_get_ntohs (tvb, offset+4) ); proto_tree_add_item( icmp6_tree, hf_icmpv6_nor, tvb, offset+4+2, 2, FALSE ); dissect_mldrv2( tvb, offset+4+2+2, nbRecords, icmp6_tree ); break; @@ -1913,6 +1915,8 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ns = &nd_neighbor_solicit; tvb_memcpy(tvb, (guint8 *)ns, offset, sizeof *ns); + proto_tree_add_text(icmp6_tree, tvb, offset+4, 4, "Reserved: %d (Should always be zero)", + tvb_get_ntohl (tvb, offset+4)); proto_tree_add_text(icmp6_tree, tvb, offset + offsetof(struct nd_neighbor_solicit, nd_ns_target), 16, #ifdef INET6 @@ -1968,6 +1972,8 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rd = &nd_redirect; tvb_memcpy(tvb, (guint8 *)rd, offset, sizeof *rd); + proto_tree_add_text(icmp6_tree, tvb, offset+4, 4, "Reserved: %d (Should always be zero)", + tvb_get_ntohs (tvb, offset+4)); proto_tree_add_text(icmp6_tree, tvb, offset + offsetof(struct nd_redirect, nd_rd_target), 16, #ifdef INET6