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-dvbci.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-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index ce8c59d21d..310d50f9b8 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -4354,7 +4354,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; } col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Session opened"); - circuit = circuit_new(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->fd->num); + circuit = circuit_new(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num); if (circuit) { /* we always add the resource id immediately after the circuit was created */ @@ -4378,9 +4378,9 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, ssnb = tvb_get_ntohs(tvb, offset+1); proto_tree_add_item(sess_tree, hf_dvbci_sess_nb, tvb, offset+1, 2, ENC_BIG_ENDIAN); - circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->fd->num); + circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num); if (circuit) - close_circuit(circuit, pinfo->fd->num); + close_circuit(circuit, pinfo->num); break; case T_SESSION_NUMBER: ssnb = tvb_get_ntohs(tvb, offset); @@ -4395,7 +4395,7 @@ dissect_dvbci_spdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } if (ssnb && !circuit) - circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->fd->num); + circuit = find_circuit(CT_DVBCI, CT_ID(ssnb, tcid), pinfo->num); /* if the packet contains no resource id, we add the cached id from the circuit so that each packet has a resource id that can be |