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-icmp.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-icmp.c')
| -rw-r--r-- | epan/dissectors/packet-icmp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index daca0d94cb..890e011e93 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -356,12 +356,12 @@ static conversation_t *_find_or_create_conversation(packet_info * pinfo) /* Have we seen this conversation before? */ conv = - find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + 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, + conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); } return conv; @@ -955,7 +955,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, icmp_key[1].key = NULL; icmp_trans = wmem_new(wmem_file_scope(), icmp_transaction_t); - icmp_trans->rqst_frame = PINFO_FD_NUM(pinfo); + icmp_trans->rqst_frame = pinfo->num; icmp_trans->resp_frame = 0; icmp_trans->rqst_time = pinfo->abs_ts; nstime_set_zero(&icmp_trans->resp_time); @@ -963,7 +963,7 @@ static icmp_transaction_t *transaction_start(packet_info * pinfo, (void *) icmp_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmp_key[0].length = 2; icmp_key[0].key = key; @@ -1022,7 +1022,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, double resp_time; conversation = - find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, 0, 0, 0); if (conversation == NULL) { return NULL; @@ -1052,7 +1052,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, return NULL; } - icmp_trans->resp_frame = PINFO_FD_NUM(pinfo); + icmp_trans->resp_frame = pinfo->num; /* we found a match. Add entries to the matched table for both request and reply frames */ @@ -1072,7 +1072,7 @@ static icmp_transaction_t *transaction_end(packet_info * pinfo, (void *) icmp_trans); } else { /* Already visited this frame */ - guint32 frame_num = pinfo->fd->num; + guint32 frame_num = pinfo->num; icmp_key[0].length = 2; icmp_key[0].key = key; |