Fix for Bug 4248:

Graft and GraftAck should get the same handling

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30997 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index 89346d97bdfb18e97de3fb8d412d591fc6fea639..a80e8760d62a22635bcf0637a318560f0be0a6ed 100644 (file)
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -945,15 +945,12 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
            proto_tree *subtree = NULL;
            proto_item *tisub;
 
-           if (PIM_TYPE(pim_typever) != 7) {
-               /* not graft-ack */
                s = dissect_pim_addr(tvb, offset, pimv2_unicast, &advance);
                if (s == NULL)
                    break;
                proto_tree_add_text(pimopt_tree, tvb, offset, advance,
                    "Upstream-neighbor: %s", s);
                offset += advance;
-           }
 
            offset += 1;        /* skip reserved field */
 
@@ -962,13 +959,11 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
                "Groups: %u", ngroup);
            offset += 1;
 
-           if (PIM_TYPE(pim_typever) != 7)     {
-               /* not graft-ack */
                holdtime = tvb_get_ntohs(tvb, offset);
                proto_tree_add_text(pimopt_tree, tvb, offset, 2,
                    "Holdtime: %u%s", holdtime,
                    holdtime == 0xffff ? " (infty)" : "");
-           }
+
            offset += 2;
 
            for (i = 0; i < ngroup; i++) {