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>

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 0ffc5ab119..10cf9b126b 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -267,7 +267,7 @@ static const fragment_items mp2t_msg_frag_items = {
  *          |     +-> pid_analysis_data
  *          |     +-> pid_analysis_data
  *          |
- *          +-> frame_table (RB tree) (key: pinfo->fd->num)
+ *          +-> frame_table (RB tree) (key: pinfo->num)
  *                |
  *                +-> frame_analysis_data (only created if drop detected)
  *                      |
@@ -391,7 +391,7 @@ init_frame_analysis_data(mp2t_analysis_data_t *mp2t_data, packet_info *pinfo)
     frame_analysis_data_p = wmem_new0(wmem_file_scope(), struct frame_analysis_data);
     frame_analysis_data_p->ts_table = wmem_tree_new(wmem_file_scope());
     /* Insert into mp2t tree */
-    wmem_tree_insert32(mp2t_data->frame_table, pinfo->fd->num,
+    wmem_tree_insert32(mp2t_data->frame_table, pinfo->num,
             (void *)frame_analysis_data_p);
 
     return frame_analysis_data_p;
@@ -402,7 +402,7 @@ static frame_analysis_data_t *
 get_frame_analysis_data(mp2t_analysis_data_t *mp2t_data, packet_info *pinfo)
 {
     frame_analysis_data_t *frame_analysis_data_p;
-    frame_analysis_data_p = (frame_analysis_data_t *)wmem_tree_lookup32(mp2t_data->frame_table, pinfo->fd->num);
+    frame_analysis_data_p = (frame_analysis_data_t *)wmem_tree_lookup32(mp2t_data->frame_table, pinfo->num);
     return frame_analysis_data_p;
 }