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-selfm.c | |
parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
download | wireshark-bc5a0374bfd162d08834f5f7503bebd33d8ec943.tar.gz |
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-selfm.c')
-rw-r--r-- | epan/dissectors/packet-selfm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 4342721bf0..7bf58b039a 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -2416,7 +2416,7 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree, void* d if ((CMD_FM_CONFIG == msg_type) || (CMD_DFM_CONFIG == msg_type) || (CMD_PDFM_CONFIG == msg_type)) { /* Fill the fm_config_frame */ fm_config_frame *frame_ptr = fmconfig_frame_fast(selfm_tvb); - frame_ptr->fnum = pinfo->fd->num; + frame_ptr->fnum = pinfo->num; wmem_list_prepend(fm_conv_data->fm_config_frames, frame_ptr); } @@ -2445,7 +2445,7 @@ dissect_selfm(tvbuff_t *selfm_tvb, packet_info *pinfo, proto_tree *tree, void* d /* Enter the single frame multiple times, retrieving a single dataitem per entry */ for (cnt = 1; (cnt <= num_items); cnt++) { fastmsg_dataitem *dataitem_ptr = fastmsg_dataitem_save(selfm_tvb, offset); - dataitem_ptr->fnum = pinfo->fd->num; + dataitem_ptr->fnum = pinfo->num; dataitem_ptr->base_address = base_addr; dataitem_ptr->index_pos = cnt; |