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-ip.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-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 93528e3de0..589ba2ba6b 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2314,8 +2314,6 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } pinfo->ipproto = iph->ip_p; - pinfo->iplen = iph->ip_len; - pinfo->iphdrlen = hlen; tap_queue_packet(ip_tap, pinfo, iph); /* Skip over header + options */ @@ -2328,14 +2326,14 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) */ save_fragmented = pinfo->fragmented; if (ip_defragment && (iph->ip_off & (IP_MF|IP_OFFSET)) && - tvb_bytes_exist(tvb, offset, pinfo->iplen - pinfo->iphdrlen) && + tvb_bytes_exist(tvb, offset, iph->ip_len - hlen) && ipsum == 0) { ipfd_head = fragment_add_check(&ip_reassembly_table, tvb, offset, pinfo, iph->ip_p ^ iph->ip_id ^ src32 ^ dst32, NULL, (iph->ip_off & IP_OFFSET) * 8, - pinfo->iplen - pinfo->iphdrlen, + iph->ip_len - hlen, iph->ip_off & IP_MF); next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled IPv4", |