diff options
| author | Gerasimos Dimitriadis <dimeg@intracom.gr> | 2009-11-17 20:38:02 +0000 |
|---|---|---|
| committer | Gerasimos Dimitriadis <dimeg@intracom.gr> | 2009-11-17 20:38:02 +0000 |
| commit | bd124019a4d422d9e1845a48aff65e6cb290a96c (patch) | |
| tree | a55b7226e4fe1fa3d304a7cd887e0a6b9765e355 /epan/dissectors/packet-pim.c | |
| parent | c2cd7605afa72af1a159ae0bbbb392dc58db60c0 (diff) | |
Fix for Bug 4248:
Graft and GraftAck should get the same handling
svn path=/trunk/; revision=30997
Diffstat (limited to 'epan/dissectors/packet-pim.c')
| -rw-r--r-- | epan/dissectors/packet-pim.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index 89346d97bd..a80e8760d6 100644 --- 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++) { |