diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-27 20:38:42 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-27 20:38:42 +0000 |
| commit | 8c64c5da892b3861260950d8bd34b6c2f9acd2d4 (patch) | |
| tree | f5c414e70579768ac7b32e5e4e1ed488aa3e05b1 /epan/dissectors/packet-igmp.c | |
| parent | 63ff652b8e07600ad0c7a350f379cfb9fbbf96ab (diff) | |
Remove iplen and iphdrlen from struct _packet_info.
Dissectors should just use (reported) tvb length and taps have other ways to get the data.
svn path=/trunk/; revision=52899
Diffstat (limited to 'epan/dissectors/packet-igmp.c')
| -rw-r--r-- | epan/dissectors/packet-igmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 2e9f3634bd..ff1b230e23 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -909,7 +909,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) switch (type) { case IGMP_V1_HOST_MEMBERSHIP_QUERY: /* 0x11 v1/v2/v3 */ - if ( (pinfo->iplen-pinfo->iphdrlen)>=12 ) { + if ( tvb_reported_length(tvb)>=12 ) { /* version 3 */ offset = dissect_igmp_v3_query(tvb, pinfo, tree, type, offset); } else { @@ -967,7 +967,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) break; case IGMP_TYPE_0x25: - if ( (pinfo->iplen-pinfo->iphdrlen)>=8 ) { + if ( tvb_reported_length(tvb)>=8 ) { /* if len of igmp packet>=8 we assume it is MSNIP */ offset = dissect_msnip(tvb, pinfo, parent_tree, offset); } else { |