diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /epan/dissectors/packet-icmpv6.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-icmpv6.c')
| -rw-r--r-- | epan/dissectors/packet-icmpv6.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 6b63bde48e..bbb0bc3c47 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1199,11 +1199,11 @@ static conversation_t *_find_or_create_conversation(packet_info *pinfo) conversation_t *conv = NULL; /* Have we seen this conversation before? */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conv == NULL) { /* No, this is a new conversation. */ - conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); } return conv; @@ -1239,14 +1239,14 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre icmpv6_key[1].key = NULL; icmpv6_trans = wmem_new(wmem_file_scope(), icmp_transaction_t); - icmpv6_trans->rqst_frame = PINFO_FD_NUM(pinfo); + icmpv6_trans->rqst_frame = pinfo->num; icmpv6_trans->resp_frame = 0; icmpv6_trans->rqst_time = pinfo->abs_ts; nstime_set_zero(&icmpv6_trans->resp_time); wmem_tree_insert32_array(icmpv6_info->unmatched_pdus, icmpv6_key, (void *)icmpv6_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmpv6_key[0].length = 2; icmpv6_key[0].key = key; @@ -1271,7 +1271,7 @@ static icmp_transaction_t *transaction_start(packet_info *pinfo, proto_tree *tre so can report here (and in taps) */ expert_add_info_format(pinfo, it, &ei_icmpv6_resp_not_found, "No response seen to ICMPv6 request in frame %u", - pinfo->fd->num); + pinfo->num); } return NULL; @@ -1302,7 +1302,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, nstime_t ns; double resp_time; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conversation == NULL) return NULL; @@ -1327,7 +1327,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, if (icmpv6_trans->resp_frame != 0) return NULL; - icmpv6_trans->resp_frame = PINFO_FD_NUM(pinfo); + icmpv6_trans->resp_frame = pinfo->num; /* * we found a match. Add entries to the matched table for both @@ -1347,7 +1347,7 @@ static icmp_transaction_t *transaction_end(packet_info *pinfo, proto_tree *tree, wmem_tree_insert32_array(icmpv6_info->matched_pdus, icmpv6_key, (void *)icmpv6_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmpv6_key[0].length = 2; icmpv6_key[0].key = key; @@ -2266,7 +2266,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree hints = (ieee802154_hints_t *)p_get_proto_data(wmem_file_scope(), pinfo, proto_get_id_by_filter_name(IEEE802154_PROTOABBREV_WPAN), 0); if ((opt_len <= 24) && hints) { - lowpan_context_insert(context_id, hints->src_pan, context_len, &context_prefix, pinfo->fd->num); + lowpan_context_insert(context_id, hints->src_pan, context_len, &context_prefix, pinfo->num); } } break; |