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-sprt.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-sprt.c')
| -rw-r--r-- | epan/dissectors/packet-sprt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index caf9acc94a..b18e105a22 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -745,7 +745,7 @@ static struct _sprt_conversation_info* find_sprt_conversation_data(packet_info * conversation_t *p_conv = NULL; struct _sprt_conversation_info *p_conv_data = NULL; /* Use existing packet info if available */ - p_conv = find_conversation(pinfo->fd->num, + p_conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, @@ -1033,7 +1033,7 @@ dissect_sprt_data(tvbuff_t *tvb, /* have we previously seen a CONNECT msg in this conversation (i.e., do we know if DLCI is used w/I_OCTET?) */ if (p_conv_data->connect_frame_number == 0) { - p_conv_data->connect_frame_number = pinfo->fd->num; + p_conv_data->connect_frame_number = pinfo->num; if (word & 0x8000) { p_conv_data->i_octet_dlci_status = DLCI_PRESENT; @@ -1421,7 +1421,7 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ &pinfo->src, pinfo->srcport, 0, "SPRT stream", - pinfo->fd->num); + pinfo->num); p_conv_data = find_sprt_conversation_data(pinfo); } |