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-nbd.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-nbd.c')
| -rw-r--r-- | epan/dissectors/packet-nbd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index 456a28bc0c..c89c62545a 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -103,7 +103,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U /* * Do we have a conversation for this connection? */ - conversation = find_conversation(pinfo->fd->num, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -139,7 +139,7 @@ get_nbd_tcp_pdu_len(packet_info *pinfo, tvbuff_t *tvb, int offset, void *data _U */ handle[0]=tvb_get_ntohl(tvb, offset+8); handle[1]=tvb_get_ntohl(tvb, offset+12); - packet=pinfo->fd->num; + packet=pinfo->num; hkey[0].length=1; hkey[0].key=&packet; hkey[1].length=2; @@ -225,7 +225,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if(magic==NBD_REQUEST_MAGIC){ /* This is a request */ nbd_trans=wmem_new(wmem_file_scope(), nbd_transaction_t); - nbd_trans->req_frame=pinfo->fd->num; + nbd_trans->req_frame=pinfo->num; nbd_trans->rep_frame=0; nbd_trans->req_time=pinfo->abs_ts; nbd_trans->type=tvb_get_ntohl(tvb, offset); @@ -243,7 +243,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, nbd_trans=(nbd_transaction_t *)wmem_tree_lookup32_array(nbd_info->unacked_pdus, hkey); if(nbd_trans){ - nbd_trans->rep_frame=pinfo->fd->num; + nbd_trans->rep_frame=pinfo->num; hkey[0].length=1; hkey[0].key=&nbd_trans->rep_frame; @@ -260,7 +260,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, } } } else { - packet=pinfo->fd->num; + packet=pinfo->num; hkey[0].length=1; hkey[0].key=&packet; hkey[1].length=2; @@ -274,7 +274,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, */ if( (magic==NBD_RESPONSE_MAGIC) && (nbd_trans) - && (pinfo->fd->num<nbd_trans->req_frame) ){ + && (pinfo->num<nbd_trans->req_frame) ){ /* must have been the wrong one */ nbd_trans=NULL; } |