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-gsm_sms.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-gsm_sms.c')
-rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index e826e89a75..d4e6f048dd 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -1890,7 +1890,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset "Reassembled Short Message", fd_sm, &sm_frag_items, NULL, subtree); - if(reassembled && pinfo->fd->num == reassembled_in) + if(reassembled && pinfo->num == reassembled_in) { /* Reassembled */ col_append_str (pinfo->cinfo, COL_INFO, @@ -1927,7 +1927,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset /* Per 3GPP 31.111 chapter 6.4.10: */ /* It shall use the SMS default 7-bit coded alphabet */ /* as defined in TS 23.038 with bit 8 set to 0 */ - if(!(reassembled && pinfo->fd->num == reassembled_in)) + if(!(reassembled && pinfo->num == reassembled_in)) { proto_tree_add_item(subtree, hf_gsm_sms_text, tvb, offset, length, ENC_ASCII|ENC_NA); } @@ -1949,7 +1949,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset } else if (seven_bit) { - if(!(reassembled && pinfo->fd->num == reassembled_in)) + if(!(reassembled && pinfo->num == reassembled_in)) { /* Show unassembled SMS */ proto_tree_add_ts_23_038_7bits_item(subtree, hf_gsm_sms_text, tvb, (offset<<3)+fill_bits, @@ -1979,7 +1979,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset } else if (eight_bit) { - if (!is_fragmented || (reassembled && pinfo->fd->num == reassembled_in)) { + if (!is_fragmented || (reassembled && pinfo->num == reassembled_in)) { if (! dissector_try_uint(gsm_sms_dissector_tbl, udh_fields.port_src, sm_tvb, pinfo, subtree)) { if (! dissector_try_uint(gsm_sms_dissector_tbl, udh_fields.port_dst,sm_tvb, pinfo, subtree)) @@ -1996,7 +1996,7 @@ dis_field_ud(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset { guint rep_len = tvb_reported_length(sm_tvb); - if (!(reassembled && pinfo->fd->num == reassembled_in)) + if (!(reassembled && pinfo->num == reassembled_in)) { /* Show unreassembled SMS */ proto_tree_add_item(subtree, hf_gsm_sms_text, sm_tvb, |