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-sccp.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-sccp.c')
| -rw-r--r-- | epan/dissectors/packet-sccp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 6fc8b3e3e2..1b92f1842e 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -1329,7 +1329,7 @@ get_sccp_assoc(packet_info *pinfo, guint offset, sccp_decode_context_t* value) guint32 opck, dpck; address *opc = &(pinfo->src); address *dpc = &(pinfo->dst); - guint framenum = PINFO_FD_NUM(pinfo); + guint framenum = pinfo->num; if (value->assoc) return value->assoc; @@ -2675,7 +2675,7 @@ static sccp_msg_info_t * new_ud_msg(packet_info *pinfo, guint32 msg_type _U_) { sccp_msg_info_t *m = wmem_new0(wmem_packet_scope(), sccp_msg_info_t); - m->framenum = PINFO_FD_NUM(pinfo); + m->framenum = pinfo->num; m->data.ud.calling_gt = NULL; m->data.ud.called_gt = NULL; @@ -3317,7 +3317,7 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree, if (m->data.co.label) proto_item_append_text(pi," %s", m->data.co.label); - if ((m->framenum == PINFO_FD_NUM(pinfo)) && (m->offset == msg_offset) ) { + if ((m->framenum == pinfo->num) && (m->offset == msg_offset) ) { tap_queue_packet(sccp_tap, pinfo, m); proto_item_append_text(pi," (current)"); } |