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-gvcp.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-gvcp.c')
| -rw-r--r-- | epan/dissectors/packet-gvcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gvcp.c b/epan/dissectors/packet-gvcp.c index c6dc58a95f..e6b93fb362 100644 --- a/epan/dissectors/packet-gvcp.c +++ b/epan/dissectors/packet-gvcp.c @@ -2286,7 +2286,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { /* This is a request */ gvcp_trans = (gvcp_transaction_t*)wmem_alloc(wmem_packet_scope(), sizeof(gvcp_transaction_t)); - gvcp_trans->req_frame = pinfo->fd->num; + gvcp_trans->req_frame = pinfo->num; gvcp_trans->rep_frame = 0; gvcp_trans->addr_list = 0; gvcp_trans->addr_count = 0; @@ -2306,7 +2306,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi { gvcp_trans = (gvcp_transaction_t*)wmem_array_index(gvcp_trans_array, i); - if (gvcp_trans && (gvcp_trans->req_frame < pinfo->fd->num)) + if (gvcp_trans && (gvcp_trans->req_frame < pinfo->num)) { if (gvcp_trans->rep_frame != 0) { @@ -2314,7 +2314,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi } else { - gvcp_trans->rep_frame = pinfo->fd->num; + gvcp_trans->rep_frame = pinfo->num; } break; @@ -2338,7 +2338,7 @@ static int dissect_gvcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi for (i = 0; i < array_size; ++i) { gvcp_trans = (gvcp_transaction_t*)wmem_array_index(gvcp_trans_array, i); - if (gvcp_trans && (pinfo->fd->num == gvcp_trans->req_frame || pinfo->fd->num == gvcp_trans->rep_frame)) + if (gvcp_trans && (pinfo->num == gvcp_trans->req_frame || pinfo->num == gvcp_trans->rep_frame)) { break; } |