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-lbtrm.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-lbtrm.c')
| -rw-r--r-- | epan/dissectors/packet-lbtrm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index a2e3f0f1d6..9d4bf35fe3 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -1181,22 +1181,22 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* Note that this won't handle the case when a NAK occurs in the capture before any other packets for that transport. Oh well. */ if (packet_type == LBTRM_PACKET_TYPE_NAK) { - transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->fd->num); + transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->num); } else { - transport = lbtrm_transport_add(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->fd->num); + transport = lbtrm_transport_add(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->num); } } else { if (packet_type == LBTRM_PACKET_TYPE_NAK) { - transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->fd->num); + transport = lbtrm_transport_unicast_find(&(pinfo->dst), src_port, session_id, pinfo->num); } else { - transport = lbtrm_transport_find(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->fd->num); + transport = lbtrm_transport_find(&(pinfo->src), src_port, session_id, &(pinfo->dst), dest_port, pinfo->num); } } if (transport != NULL) @@ -1303,7 +1303,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, { if (transport != NULL) { - lbtrm_transport_frame_add(transport, packet_type, pinfo->fd->num, sequence, retransmission); + lbtrm_transport_frame_add(transport, packet_type, pinfo->num, sequence, retransmission); } } else @@ -1316,7 +1316,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, transport_item = proto_tree_add_item(lbtrm_tree, hf_lbtrm_analysis, tvb, 0, 0, ENC_NA); PROTO_ITEM_SET_GENERATED(transport_item); transport_tree = proto_item_add_subtree(transport_item, ett_lbtrm_transport); - frame = lbtrm_transport_frame_find(transport, pinfo->fd->num); + frame = lbtrm_transport_frame_find(transport, pinfo->num); if (frame != NULL) { lbm_transport_sqn_t * sqn = NULL; @@ -1358,7 +1358,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtrm_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; - cb_data.current_frame = pinfo->fd->num; + cb_data.current_frame = pinfo->num; wmem_tree_foreach(sqn->frame, dissect_lbtrm_sqn_frame_list_callback, (void *) &cb_data); } } @@ -1412,7 +1412,7 @@ static int dissect_lbtrm(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, frame_tree = proto_item_add_subtree(frame_tree_item, ett_lbtrm_transport_sqn); cb_data.tree = frame_tree; cb_data.tvb = tvb; - cb_data.current_frame = pinfo->fd->num; + cb_data.current_frame = pinfo->num; wmem_tree_foreach(sqn->frame, dissect_lbtrm_sqn_frame_list_callback, (void *) &cb_data); } } |