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>

32 files changed, 103 insertions, 103 deletions

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index 15fe950498..c76f4ece50 100644
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -140,7 +140,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 	fInfo->fp->partner = NULL;
 	fInfo->fp->count = 1;
 	fInfo->fp->cksum = computed_cksum;
-	fInfo->num = pinfo->fd->num;
+	fInfo->num = pinfo->num;
 	fInfo->id = ci->ip_id;
 	fInfo->ip_ttl = ci->ip_ttl;
 	fInfo->dl_dst = pinfo->dl_dst;
@@ -148,7 +148,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 	/* clean memory */
 	nstime_set_zero(&fInfo->zebra_time);
 	nstime_set_zero(&fInfo->fp->predecessor_time);
-	g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->fd->num), fInfo);
+	g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->num), fInfo);
 
 	return 1;
 }
@@ -175,7 +175,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg)
 	/* we only need one value out of pinfo we use a temp one */
 	packet_info *pinfo = (packet_info*)g_malloc(sizeof(packet_info));
 	pinfo->fd = (frame_data*)g_malloc(sizeof(frame_data));
-	pinfo->fd->num = fInfo->num;
+	pinfo->num = fInfo->num;
 
 	fInfoTemp = (frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id));
 	if (fInfoTemp == NULL) {
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index 99c42813ff..efa9d3e478 100644
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -143,8 +143,8 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const
 	/* Several diameter messages within one frame are possible.                    *
 	 * Check if we processing the message in same frame like befor or in new frame.*/
 	ds = (diameteravp_t *)pds;
-	if (pinfo->fd->num > ds->frame) {
-		ds->frame = pinfo->fd->num;
+	if (pinfo->num > ds->frame) {
+		ds->frame = pinfo->num;
 		ds->diammsg_toprocess = 0;
 	} else {
 			ds->diammsg_toprocess += 1;
@@ -187,7 +187,7 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const
 				}
 				/* Output frame data.*/
 				printf("frame='%u' time='%f' src='%s' srcport='%u' dst='%s' dstport='%u' proto='diameter' msgnr='%u' is_request='%d' cmd='%u' req_frame='%u' ans_frame='%u' resp_time='%f' ",
-				       pinfo->fd->num, nstime_to_sec(&pinfo->abs_ts), address_to_str(pinfo->pool, &pinfo->src), pinfo->srcport, address_to_str(pinfo->pool, &pinfo->dst), pinfo->destport, ds->diammsg_toprocess, is_request, cmd_code, req_frame, ans_frame, resp_time);
+				       pinfo->num, nstime_to_sec(&pinfo->abs_ts), address_to_str(pinfo->pool, &pinfo->src), pinfo->srcport, address_to_str(pinfo->pool, &pinfo->dst), pinfo->destport, ds->diammsg_toprocess, is_request, cmd_code, req_frame, ans_frame, resp_time);
 				/* Visit selected nodes of one diameter message.*/
 				tree_traverse_pre_order(current, diam_tree_to_csv, &ds);
 				/* End of message.*/
diff --git a/ui/export_object_dicom.c b/ui/export_object_dicom.c
index 0f075d5ebe..5404abb54f 100644
--- a/ui/export_object_dicom.c
+++ b/ui/export_object_dicom.c
@@ -50,7 +50,7 @@ eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_,
         */
         entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t));
 
-        entry->pkt_num = pinfo->fd->num;
+        entry->pkt_num = pinfo->num;
         entry->hostname = eo_info->hostname;
         entry->content_type = eo_info->content_type;
         entry->filename = g_strdup(g_path_get_basename(eo_info->filename));
diff --git a/ui/export_object_http.c b/ui/export_object_http.c
index d92ec97660..3b314c4fb5 100644
--- a/ui/export_object_http.c
+++ b/ui/export_object_http.c
@@ -45,7 +45,7 @@ eo_http_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_,
          * is closed. */
         entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t));
 
-        entry->pkt_num = pinfo->fd->num;
+        entry->pkt_num = pinfo->num;
         entry->hostname = g_strdup(eo_info->hostname);
         entry->content_type = g_strdup(eo_info->content_type);
         entry->filename = g_strdup(g_path_get_basename(eo_info->filename));
diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c
index a0343c6692..ca22f8bef3 100644
--- a/ui/export_object_smb.c
+++ b/ui/export_object_smb.c
@@ -362,7 +362,7 @@ eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const
         new_file->free_chunk_list = NULL;
         new_file->data_gathered = 0;
         new_file->is_out_of_memory = FALSE;
-        entry->pkt_num = pinfo->fd->num;
+        entry->pkt_num = pinfo->num;
 
         entry->hostname=g_filename_display_name(g_strcanon(eo_info->hostname,LEGAL_FILENAME_CHARS,'?'));
         entry->filename=g_filename_display_name(g_strcanon(eo_info->filename,LEGAL_FILENAME_CHARS,'?'));
diff --git a/ui/export_object_tftp.c b/ui/export_object_tftp.c
index 18eda94b09..11547aca38 100644
--- a/ui/export_object_tftp.c
+++ b/ui/export_object_tftp.c
@@ -59,7 +59,7 @@ eo_tftp_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_,
     entry = (export_object_entry_t*)g_malloc(sizeof(export_object_entry_t));
 
     /* Remember which frame had the last block of the file */
-    entry->pkt_num = pinfo->fd->num;
+    entry->pkt_num = pinfo->num;
 
     /* Copy filename */
     entry->filename = g_strdup(g_path_get_basename(eo_info->filename));
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index fdb4defbe1..1d77b253be 100644
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -198,7 +198,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 	computed_cksum=in_cksum(&cksum_vec[0], 3);
 
 	/* Set up the new order to create the zebra effect */
-	fInfoTemp=(frame_info *)g_hash_table_lookup(cs->packet_set, GINT_TO_POINTER(pinfo->fd->num));
+	fInfoTemp=(frame_info *)g_hash_table_lookup(cs->packet_set, GINT_TO_POINTER(pinfo->num));
 	if((fInfoTemp!=NULL)){
 		col_set_time(pinfo->cinfo, COL_INFO, &fInfoTemp->zebra_time, "ZebraTime");
 	}
@@ -209,7 +209,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 	fInfo->fg->partner=NULL;
 	fInfo->fg->count=1;
 	fInfo->fg->cksum=computed_cksum;
-	fInfo->num=pinfo->fd->num;
+	fInfo->num=pinfo->num;
 	fInfo->id=ci->ip_id;
 	fInfo->ip_ttl=ci->ip_ttl;
 	fInfo->dl_dst=pinfo->dl_dst;
@@ -217,7 +217,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
 	/* clean memory */
 	nstime_set_zero(&fInfo->zebra_time);
 	nstime_set_zero(&fInfo->fg->predecessor_time);
-	g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->fd->num), fInfo);
+	g_hash_table_insert(cs->packet_set, GINT_TO_POINTER(pinfo->num), fInfo);
 
 	if((guint32)cf_get_packet_count(&cfile)==fInfo->num){
 		nstime_set_unset(&cs->current_time);
@@ -248,7 +248,7 @@ call_foreach_count_ip_id(gpointer key _U_, gpointer value, gpointer arg)
 	/* we only need one value out of pinfo we use a temp one */
 	packet_info *pinfo=(packet_info*)g_malloc(sizeof(packet_info));
 	pinfo->fd=(frame_data*)g_malloc(sizeof(frame_data));
-	pinfo->fd->num = fInfo->num;
+	pinfo->num = fInfo->num;
 
 	fInfoTemp=(frame_info *)g_hash_table_lookup(cs->ip_id_set, GINT_TO_POINTER((gint)fInfo->id));
 	if(fInfoTemp==NULL){
diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 6a5e59ff94..d0eceb4a43 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -562,7 +562,7 @@ static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data,
 	/*  is this the first packet we got in this direction? */
 	if (statinfo->flags & STAT_FLAG_FIRST) {
 		add_to_list(list, user_data,
-			pinfo->fd->num,
+			pinfo->num,
 			0,
 			0,
 			statinfo->bandwidth,
@@ -573,7 +573,7 @@ static int iax2_packet_add_info(GtkWidget *list, user_data_t * user_data,
 	}
 	else {
 		add_to_list(list, user_data,
-			pinfo->fd->num,
+			pinfo->num,
 			statinfo->delta*1000,
 			statinfo->jitter*1000,
 			statinfo->bandwidth,
diff --git a/ui/gtk/lbm_stream_dlg.c b/ui/gtk/lbm_stream_dlg.c
index 4478ffbe67..18ddbbf6d6 100644
--- a/ui/gtk/lbm_stream_dlg.c
+++ b/ui/gtk/lbm_stream_dlg.c
@@ -601,13 +601,13 @@ static gboolean lbmc_stream_dlg_tap_packet(void * tap_data, packet_info * pinfo,
             -1);
     }
     stream_iter = stream->iter;
-    if (stream->first_frame > pinfo->fd->num)
+    if (stream->first_frame > pinfo->num)
     {
-        stream->first_frame = pinfo->fd->num;
+        stream->first_frame = pinfo->num;
     }
-    if (stream->last_frame < pinfo->fd->num)
+    if (stream->last_frame < pinfo->num)
     {
-        stream->last_frame = pinfo->fd->num;
+        stream->last_frame = pinfo->num;
     }
     stream->bytes += tapinfo->bytes;
     stream->messages++;
@@ -701,13 +701,13 @@ static gboolean lbmc_stream_dlg_tap_packet(void * tap_data, packet_info * pinfo,
             -1);
     }
     substream_iter = substream->iter;
-    if (substream->first_frame > pinfo->fd->num)
+    if (substream->first_frame > pinfo->num)
     {
-        substream->first_frame = pinfo->fd->num;
+        substream->first_frame = pinfo->num;
     }
-    if (substream->last_frame < pinfo->fd->num)
+    if (substream->last_frame < pinfo->num)
     {
-        substream->last_frame = pinfo->fd->num;
+        substream->last_frame = pinfo->num;
     }
     substream->bytes += tapinfo->bytes;
     substream->messages++;
diff --git a/ui/gtk/lbm_uimflow_dlg.c b/ui/gtk/lbm_uimflow_dlg.c
index 8855c240c6..477c067e4c 100644
--- a/ui/gtk/lbm_uimflow_dlg.c
+++ b/ui/gtk/lbm_uimflow_dlg.c
@@ -166,7 +166,7 @@ static int lbmc_uim_flow_graph_add_to_graph(packet_info * pinfo, const lbm_uim_s
     item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t));
     copy_address(&(item->src_addr), &(pinfo->src));
     copy_address(&(item->dst_addr), &(pinfo->dst));
-    item->frame_number = pinfo->fd->num;
+    item->frame_number = pinfo->num;
     item->port_src = pinfo->srcport;
     item->port_dst = pinfo->destport;
     item->protocol = g_strdup(port_type_to_str(pinfo->ptype));
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 9c2c672209..9c1f6f685f 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -639,7 +639,7 @@ rtp_packet_add_info(GtkWidget *list, user_data_t * user_data,
 	/*  is this the first packet we got in this direction? */
 	if (statinfo->flags & STAT_FLAG_FIRST) {
 		add_to_list(list, user_data,
-			pinfo->fd->num, rtpinfo->info_seq_num,
+			pinfo->num, rtpinfo->info_seq_num,
 			statinfo->timestamp,
 			0,
 			0,
@@ -653,7 +653,7 @@ rtp_packet_add_info(GtkWidget *list, user_data_t * user_data,
 	}
 	else {
 		add_to_list(list, user_data,
-			pinfo->fd->num, rtpinfo->info_seq_num,
+			pinfo->num, rtpinfo->info_seq_num,
 			statinfo->timestamp,
 			statinfo->delta,
 			statinfo->jitter,
diff --git a/ui/io_graph_item.h b/ui/io_graph_item.h
index bfb581a955..d4e51995a8 100644
--- a/ui/io_graph_item.h
+++ b/ui/io_graph_item.h
@@ -142,9 +142,9 @@ update_io_graph_item(io_graph_item_t *items, int idx, packet_info *pinfo, epan_d
 
     /* Set the first and last frame num in current interval matching the target field+filter  */
     if (item->first_frame_in_invl == 0) {
-        item->first_frame_in_invl = pinfo->fd->num;
+        item->first_frame_in_invl = pinfo->num;
     }
-    item->last_frame_in_invl = pinfo->fd->num;
+    item->last_frame_in_invl = pinfo->num;
 
     if (edt && hf_index >= 0) {
         GPtrArray *gp;
diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c
index 549c5a9d0b..badc1fcf36 100644
--- a/ui/mcast_stream.c
+++ b/ui/mcast_stream.c
@@ -198,7 +198,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
             pinfo->srcport, address_to_display(NULL, &(pinfo->dst)), pinfo->destport);*/
         tmp_strinfo.npackets = 0;
         tmp_strinfo.apackets = 0;
-        tmp_strinfo.first_frame_num = pinfo->fd->num;
+        tmp_strinfo.first_frame_num = pinfo->num;
         tmp_strinfo.start_abs = pinfo->abs_ts;
         tmp_strinfo.start_rel = pinfo->rel_ts;
         tmp_strinfo.vlan_id = 0;
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
index 2b787552da..ae20f883e5 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
@@ -237,7 +237,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet
     item->setText(column_number_handle, handle);
     item->setText(column_number_uuid, uuid);
     item->setText(column_number_uuid_name,  uuid_name);
-    item->setData(0, Qt::UserRole, qVariantFromValue(pinfo->fd->num));
+    item->setData(0, Qt::UserRole, qVariantFromValue(pinfo->num));
 
     for (int i = 0; i < dialog->ui->tableTreeWidget->columnCount(); i++) {
         dialog->ui->tableTreeWidget->resizeColumnToContents(i);
diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp
index 4991b8e22b..914fbd3d1e 100644
--- a/ui/qt/bluetooth_devices_dialog.cpp
+++ b/ui/qt/bluetooth_devices_dialog.cpp
@@ -270,7 +270,7 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo
         item_data_t *item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_device->interface_id;
         item_data->adapter_id = tap_device->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
     }
 
diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp
index 035735837d..c896ac091a 100644
--- a/ui/qt/bluetooth_hci_summary_dialog.cpp
+++ b/ui/qt/bluetooth_hci_summary_dialog.cpp
@@ -406,7 +406,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
             break;
 
         frame_item = new QTreeWidgetItem();
-        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num));
+        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num));
         frame_item->setText(column_number_ogf, QString("").sprintf("0x%02X", tap_hci->ogf));
         frame_item->setText(column_number_ocf, QString("").sprintf("0x%04X", tap_hci->ocf));
         frame_item->setText(column_number_opcode, QString("").sprintf("0x%04X", tap_hci->ogf << 10 | tap_hci->ocf));
@@ -415,7 +415,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
         item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_hci->interface_id;
         item_data->adapter_id   = tap_hci->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
 
         break;
@@ -454,14 +454,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
             break;
 
         frame_item = new QTreeWidgetItem();
-        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num));
+        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num));
         frame_item->setText(column_number_event, QString("").sprintf("0x%02X", tap_hci->event));
         item->addChild(frame_item);
 
         item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_hci->interface_id;
         item_data->adapter_id   = tap_hci->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
 
         break;
@@ -491,14 +491,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
         item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1));
 
         frame_item = new QTreeWidgetItem();
-        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num));
+        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num));
         frame_item->setText(column_number_status, QString("").sprintf("0x%02X", tap_hci->status));
         item->addChild(frame_item);
 
         item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_hci->interface_id;
         item_data->adapter_id   = tap_hci->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
 
         break;
@@ -525,14 +525,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
         item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1));
 
         frame_item = new QTreeWidgetItem();
-        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num));
+        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num));
         frame_item->setText(column_number_status, QString("").sprintf("%u", tap_hci->status));
         item->addChild(frame_item);
 
         item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_hci->interface_id;
         item_data->adapter_id   = tap_hci->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
 
         break;
@@ -562,14 +562,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
         item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1));
 
         frame_item = new QTreeWidgetItem();
-        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num));
+        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num));
         frame_item->setText(column_number_reason, QString("").sprintf("0x%02X", tap_hci->reason));
         item->addChild(frame_item);
 
         item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_hci->interface_id;
         item_data->adapter_id   = tap_hci->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
 
         break;
@@ -596,14 +596,14 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi
         item->setText(column_number_occurrence, QString::number(item->text(column_number_occurrence).toInt() + 1));
 
         frame_item = new QTreeWidgetItem();
-        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->fd->num));
+        frame_item->setText(column_number_name, QString(tr("Frame %1")).arg(pinfo->num));
         frame_item->setText(column_number_hardware_error, QString("").sprintf("0x%02X", tap_hci->hardware_error));
         item->addChild(frame_item);
 
         item_data = wmem_new(wmem_file_scope(), item_data_t);
         item_data->interface_id = tap_hci->interface_id;
         item_data->adapter_id   = tap_hci->adapter_id;
-        item_data->frame_number = pinfo->fd->num;
+        item_data->frame_number = pinfo->num;
         frame_item->setData(0, Qt::UserRole, QVariant::fromValue<item_data_t *>(item_data));
 
         break;
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp
index b8cb240a1f..506398b30c 100644
--- a/ui/qt/iax2_analysis_dialog.cpp
+++ b/ui/qt/iax2_analysis_dialog.cpp
@@ -81,7 +81,7 @@ public:
     Iax2AnalysisTreeWidgetItem(QTreeWidget *tree, tap_iax2_stat_t *statinfo, packet_info *pinfo) :
         QTreeWidgetItem(tree, iax2_analysis_type_)
     {
-        frame_num_ = pinfo->fd->num;
+        frame_num_ = pinfo->num;
         pkt_len_ = pinfo->fd->pkt_len;
         flags_ = statinfo->flags;
         if (flags_ & STAT_FLAG_FIRST) {
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index 54f199e640..8bf3553aa3 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -512,7 +512,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons
                 sqn = it.value();
             }
         }
-        sqn->processFrame(pinfo->fd->num);
+        sqn->processFrame(pinfo->num);
     }
     else if (tap_info->type == LBTRM_PACKET_TYPE_NCF)
     {
@@ -535,7 +535,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons
             {
                 sqn = it.value();
             }
-            sqn->processFrame(tap_info->ncf_reason, pinfo->fd->num);
+            sqn->processFrame(tap_info->ncf_reason, pinfo->num);
         }
     }
     else if (tap_info->type == LBTRM_PACKET_TYPE_SM)
@@ -555,7 +555,7 @@ void LBMLBTRMSourceTransportEntry::processPacket(const packet_info * pinfo, cons
         {
             sqn = it.value();
         }
-        sqn->processFrame(pinfo->fd->num);
+        sqn->processFrame(pinfo->num);
     }
     else
     {
@@ -874,7 +874,7 @@ void LBMLBTRMReceiverTransportEntry::processPacket(const packet_info * pinfo, co
             {
                 sqn = it.value();
             }
-            sqn->processFrame(pinfo->fd->num);
+            sqn->processFrame(pinfo->num);
         }
     }
     else
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index 447f1829fa..190ff5ae71 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -657,7 +657,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons
             {
                 sqn = it.value();
             }
-            sqn->processFrame(pinfo->fd->num);
+            sqn->processFrame(pinfo->num);
         }
         else
         {
@@ -674,7 +674,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons
                 sqn = it.value();
             }
         }
-        sqn->processFrame(pinfo->fd->num);
+        sqn->processFrame(pinfo->num);
     }
     else if (tap_info->type == LBTRU_PACKET_TYPE_NCF)
     {
@@ -697,7 +697,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons
             {
                 sqn = it.value();
             }
-            sqn->processFrame(tap_info->ncf_reason, pinfo->fd->num);
+            sqn->processFrame(tap_info->ncf_reason, pinfo->num);
         }
     }
     else if (tap_info->type == LBTRU_PACKET_TYPE_SM)
@@ -717,7 +717,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons
         {
             sqn = it.value();
         }
-        sqn->processFrame(pinfo->fd->num);
+        sqn->processFrame(pinfo->num);
     }
     else if (tap_info->type == LBTRU_PACKET_TYPE_RST)
     {
@@ -736,7 +736,7 @@ void LBMLBTRUSourceTransportEntry::processPacket(const packet_info * pinfo, cons
         {
             reason = it.value();
         }
-        reason->processFrame(pinfo->fd->num);
+        reason->processFrame(pinfo->num);
     }
     else
     {
@@ -1105,7 +1105,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co
                     {
                         sqn = it.value();
                     }
-                    sqn->processFrame(pinfo->fd->num);
+                    sqn->processFrame(pinfo->num);
                 }
             }
             break;
@@ -1126,7 +1126,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co
                 {
                     sqn = it.value();
                 }
-                sqn->processFrame(pinfo->fd->num);
+                sqn->processFrame(pinfo->num);
             }
             break;
         case LBTRU_PACKET_TYPE_CREQ:
@@ -1146,7 +1146,7 @@ void LBMLBTRUReceiverTransportEntry::processPacket(const packet_info * pinfo, co
                 {
                     req = it.value();
                 }
-                req->processFrame(pinfo->fd->num);
+                req->processFrame(pinfo->num);
             }
             break;
         default:
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index cc0341acac..b687cfc9a5 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -209,13 +209,13 @@ void LBMStreamEntry::processPacket(const packet_info * pinfo, const lbm_uim_stre
     LBMSubstreamEntry * substream = NULL;
     LBMSubstreamMapIterator it;
 
-    if (m_first_frame > pinfo->fd->num)
+    if (m_first_frame > pinfo->num)
     {
-        m_first_frame = pinfo->fd->num;
+        m_first_frame = pinfo->num;
     }
-    if (m_flast_frame < pinfo->fd->num)
+    if (m_flast_frame < pinfo->num)
     {
-        m_flast_frame = pinfo->fd->num;
+        m_flast_frame = pinfo->num;
     }
     m_bytes += stream_info->bytes;
     m_messages++;
@@ -236,7 +236,7 @@ void LBMStreamEntry::processPacket(const packet_info * pinfo, const lbm_uim_stre
         substream = it.value();
     }
     fillItem();
-    substream->processPacket(pinfo->fd->num, stream_info->bytes);
+    substream->processPacket(pinfo->num, stream_info->bytes);
 }
 
 void LBMStreamEntry::setItem(QTreeWidgetItem * item)
diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp
index c166a43fb4..f1b74517be 100644
--- a/ui/qt/lbm_uimflow_dialog.cpp
+++ b/ui/qt/lbm_uimflow_dialog.cpp
@@ -125,7 +125,7 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_
     item = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t));
     copy_address(&(item->src_addr), &(pinfo->src));
     copy_address(&(item->dst_addr), &(pinfo->dst));
-    item->frame_number = pinfo->fd->num;
+    item->frame_number = pinfo->num;
     item->port_src = pinfo->srcport;
     item->port_dst = pinfo->destport;
     item->protocol = g_strdup(port_type_to_str(pinfo->ptype));
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index 11d7e2e585..ae4bb53d18 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -457,9 +457,9 @@ void PacketList::selectionChanged (const QItemSelection & selected, const QItemS
 
     if (proto_tree_ && cap_file_->edt->tree) {
         packet_info *pi = &cap_file_->edt->pi;
-        related_packet_delegate_.setCurrentFrame(pi->fd->num);
+        related_packet_delegate_.setCurrentFrame(pi->num);
         proto_tree_->fillProtocolTree(cap_file_->edt->tree);
-        conversation_t *conv = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype,
+        conversation_t *conv = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype,
                                                 pi->srcport, pi->destport, 0);
         if (conv) {
             related_packet_delegate_.setConversation(conv);
diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp
index bdd17905a6..8fab6f03f9 100644
--- a/ui/qt/packet_list_record.cpp
+++ b/ui/qt/packet_list_record.cpp
@@ -166,7 +166,7 @@ void PacketListRecord::dissect(capture_file *cap_file, bool dissect_color)
     data_ver_ = col_data_ver_;
 
     packet_info *pi = &edt.pi;
-    conv_ = find_conversation(pi->fd->num, &pi->src, &pi->dst, pi->ptype,
+    conv_ = find_conversation(pi->num, &pi->src, &pi->dst, pi->ptype,
                               pi->srcport, pi->destport, 0);
 
     epan_dissect_cleanup(&edt);
diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp
index 04ddece52c..6821ce6af7 100644
--- a/ui/qt/rtp_analysis_dialog.cpp
+++ b/ui/qt/rtp_analysis_dialog.cpp
@@ -83,7 +83,7 @@ public:
     RtpAnalysisTreeWidgetItem(QTreeWidget *tree, tap_rtp_stat_t *statinfo, packet_info *pinfo, const struct _rtp_info *rtpinfo) :
         QTreeWidgetItem(tree, rtp_analysis_type_)
     {
-        frame_num_ = pinfo->fd->num;
+        frame_num_ = pinfo->num;
         sequence_num_ = rtpinfo->info_seq_num;
         pkt_len_ = pinfo->fd->pkt_len;
         flags_ = statinfo->flags;
diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp
index 7ccaba690c..5cfba191e8 100644
--- a/ui/qt/rtp_audio_stream.cpp
+++ b/ui/qt/rtp_audio_stream.cpp
@@ -141,7 +141,7 @@ void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const struct
         start_abs_offset_ = nstime_to_sec(&pinfo->abs_ts) - start_rel_time_;
         start_rel_time_ = stop_rel_time_ = nstime_to_sec(&pinfo->rel_ts);
     }
-    rtp_packet->frame_num = pinfo->fd->num;
+    rtp_packet->frame_num = pinfo->num;
     rtp_packet->arrive_offset = nstime_to_sec(&pinfo->rel_ts) - start_rel_time_;
 
     rtp_packets_ << rtp_packet;
diff --git a/ui/tap-iax2-analysis.c b/ui/tap-iax2-analysis.c
index da06e279f1..f057743eb6 100644
--- a/ui/tap-iax2-analysis.c
+++ b/ui/tap-iax2-analysis.c
@@ -103,7 +103,7 @@ iax2_packet_analyse(tap_iax2_stat_t *statinfo,
         /* include it in maximum delta calculation */
         if (statinfo->delta > statinfo->max_delta) {
             statinfo->max_delta = statinfo->delta;
-            statinfo->max_nr = pinfo->fd->num;
+            statinfo->max_nr = pinfo->num;
         }
         /* maximum and mean jitter calculation */
         if (statinfo->jitter > statinfo->max_jitter) {
diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c
index 1d807be734..e5bb6cfeb5 100644
--- a/ui/tap-rlc-graph.c
+++ b/ui/tap-rlc-graph.c
@@ -198,7 +198,7 @@ int rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *ed
 
         /* It matches.  Add to end of segment list */
         segment->next = NULL;
-        segment->num = pinfo->fd->num;
+        segment->num = pinfo->num;
         segment->rel_secs = (guint32) pinfo->rel_ts.secs;
         segment->rel_usecs = pinfo->rel_ts.nsecs/1000;
         segment->abs_secs = (guint32) pinfo->abs_ts.secs;
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index 312c4b4a38..b523b198bd 100644
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -668,7 +668,7 @@ rtp_packet_analyse(tap_rtp_stat_t *statinfo,
 		/* Include it in maximum delta calculation */
 		if (statinfo->delta > statinfo->max_delta) {
 			statinfo->max_delta = statinfo->delta;
-			statinfo->max_nr = pinfo->fd->num;
+			statinfo->max_nr = pinfo->num;
 		}
 		if (clock_rate != 0) {
 			/* Maximum and mean jitter calculation */
diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c
index 114f3d75d3..75375bdb03 100644
--- a/ui/tap-sctp-analysis.c
+++ b/ui/tap-sctp-analysis.c
@@ -336,7 +336,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
 	int i;
 	guint8 idx = 0;
 
-	framenumber = PINFO_FD_NUM(pinfo);
+	framenumber = pinfo->num;
 
 	type = sctp_info->ip_src.type;
 
@@ -533,7 +533,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
 						info->max_usecs = tsn->usecs;
 				}
 
-				sack->frame_number = tsn->frame_number = pinfo->fd->num;
+				sack->frame_number = tsn->frame_number = pinfo->num;
 			}
 			if ((tvb_get_guint8(sctp_info->tvb[0],0) == SCTP_INIT_CHUNK_ID) || (tvb_get_guint8(sctp_info->tvb[0],0) == SCTP_INIT_ACK_CHUNK_ID))
 			{
@@ -751,7 +751,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
 				memcpy(addr,(tmp_info.dst.data),tmp_info.dst.len);
 				store->data = addr;
 				info = add_address(store, info, 2);
-				info->frame_numbers=g_list_prepend(info->frame_numbers,&(pinfo->fd->num));
+				info->frame_numbers=g_list_prepend(info->frame_numbers,&(pinfo->num));
 				if (datachunk || forwardchunk)
 					info->tsn1 = g_list_prepend(info->tsn1, tsn);
 				if (sackchunk == TRUE)
@@ -762,7 +762,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
 			{
 				gchar* tmp_str;
 				error = (sctp_error_info_t *)g_malloc(sizeof(sctp_error_info_t));
-				error->frame_number = pinfo->fd->num;
+				error->frame_number = pinfo->num;
 				error->chunk_info[0] = '\0';
 				if ((tvb_get_guint8(sctp_info->tvb[0],0)) == SCTP_INIT_CHUNK_ID)
 				{
@@ -848,9 +848,9 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi
 				else if (tsn->secs == info->max_secs && tsn->usecs > info->max_usecs)
 					info->max_usecs = tsn->usecs;
 			}
-			sack->frame_number = tsn->frame_number = pinfo->fd->num;
+			sack->frame_number = tsn->frame_number = pinfo->num;
 		}
-		info->frame_numbers = g_list_prepend(info->frame_numbers,&(pinfo->fd->num));
+		info->frame_numbers = g_list_prepend(info->frame_numbers,&(pinfo->num));
 
 		store = (address *)g_malloc(sizeof (address));
 		store->type = tmp_info.src.type;
diff --git a/ui/tap-sequence-analysis.c b/ui/tap-sequence-analysis.c
index d9538bb180..696ab3b14d 100644
--- a/ui/tap-sequence-analysis.c
+++ b/ui/tap-sequence-analysis.c
@@ -105,7 +105,7 @@ seq_analysis_frame_packet( void *ptr, packet_info *pinfo, epan_dissect_t *edt _U
 
         if (!sai) return FALSE;
 
-        sai->frame_number = pinfo->fd->num;
+        sai->frame_number = pinfo->num;
 
         sai->port_src=pinfo->srcport;
         sai->port_dst=pinfo->destport;
@@ -197,7 +197,7 @@ seq_analysis_tcp_packet( void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt
         seq_analysis_item_t *sai;
 
         sai = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t));
-        sai->frame_number = pinfo->fd->num;
+        sai->frame_number = pinfo->num;
         if (sainfo->any_addr) {
             copy_address(&(sai->src_addr),&(pinfo->net_src));
             copy_address(&(sai->dst_addr),&(pinfo->net_dst));
diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c
index 89d27651ef..abf357683d 100644
--- a/ui/tap-tcp-stream.c
+++ b/ui/tap-tcp-stream.c
@@ -76,7 +76,7 @@ tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, cons
     {
         struct segment *segment = (struct segment *)g_malloc(sizeof(struct segment));
         segment->next      = NULL;
-        segment->num       = pinfo->fd->num;
+        segment->num       = pinfo->num;
         segment->rel_secs  = (guint32)pinfo->rel_ts.secs;
         segment->rel_usecs = pinfo->rel_ts.nsecs/1000;
         /* Currently unused
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index 954f35fd18..49060fb20b 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -330,7 +330,7 @@ add_to_graph(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *
     }
 
     gai = (seq_analysis_item_t *)g_malloc0(sizeof(seq_analysis_item_t));
-    gai->frame_number = pinfo->fd->num;
+    gai->frame_number = pinfo->num;
     copy_address(&(gai->src_addr),src_addr);
     copy_address(&(gai->dst_addr),dst_addr);
 
@@ -516,7 +516,7 @@ rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _
         return FALSE;
     }
 
-    tapinfo->rtp_evt_frame_num = pinfo->fd->num;
+    tapinfo->rtp_evt_frame_num = pinfo->num;
     tapinfo->rtp_evt = pi->info_rtp_evt;
     tapinfo->rtp_evt_end = pi->info_end;
 
@@ -624,7 +624,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c
     }
 
     /* if this is a duplicated RTP Event End, just return */
-    if ((tapinfo->rtp_evt_frame_num == pinfo->fd->num) && !strinfo && (tapinfo->rtp_evt_end == TRUE)) {
+    if ((tapinfo->rtp_evt_frame_num == pinfo->num) && !strinfo && (tapinfo->rtp_evt_end == TRUE)) {
         return FALSE;
     }
 
@@ -663,7 +663,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c
     strinfo->stop_fd = pinfo->fd;
 
     /* process RTP Event */
-    if (tapinfo->rtp_evt_frame_num == pinfo->fd->num) {
+    if (tapinfo->rtp_evt_frame_num == pinfo->num) {
         strinfo->rtp_event = tapinfo->rtp_evt;
         if (tapinfo->rtp_evt_end == TRUE) {
             strinfo->end_stream = TRUE;
@@ -1085,7 +1085,7 @@ sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt ,
 
     const sip_info_value_t *pi = (const sip_info_value_t *)SIPinfo;
 
-    tapinfo->sip_frame_num = pinfo->fd->num;
+    tapinfo->sip_frame_num = pinfo->num;
 
     /* do not consider packets without call_id */
     if (pi->tap_call_id ==NULL) {
@@ -1230,8 +1230,8 @@ TODO: is useful but not perfect, what is appended is truncated when displayed in
         g_free((void *)tmp_dst.data);
 
         /* add SDP info if apply */
-        if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->fd->num) ) {
-            append_to_frame_graph(tapinfo, pinfo->fd->num, tapinfo->sdp_summary, NULL);
+        if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->num) ) {
+            append_to_frame_graph(tapinfo, pinfo->num, tapinfo->sdp_summary, NULL);
             g_free(tapinfo->sdp_summary);
             tapinfo->sdp_summary = NULL;
         }
@@ -1307,7 +1307,7 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
     const isup_tap_rec_t *pi = (const isup_tap_rec_t *)isup_info;
 
     /* check if the lower layer is MTP matching the frame number */
-    if (tapinfo->mtp3_frame_num != pinfo->fd->num)
+    if (tapinfo->mtp3_frame_num != pinfo->num)
         return FALSE;
 
     /* check whether we already have a call with these parameters in the list */
@@ -1508,7 +1508,7 @@ mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt
     tapinfo->mtp3_opc = pi->addr_opc.pc;
     tapinfo->mtp3_dpc = pi->addr_dpc.pc;
     tapinfo->mtp3_ni = pi->addr_opc.ni;
-    tapinfo->mtp3_frame_num = pinfo->fd->num;
+    tapinfo->mtp3_frame_num = pinfo->num;
 
     return FALSE;
 }
@@ -1596,7 +1596,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
     else
         tapinfo->q931_called_number = g_strdup("");
     tapinfo->q931_cause_value = pi->cause_value;
-    tapinfo->q931_frame_num = pinfo->fd->num;
+    tapinfo->q931_frame_num = pinfo->num;
     tapinfo->q931_crv = pi->crv;
 
 
@@ -1718,7 +1718,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
                     }
 
                     /* Add the H245 info if exists to the Graph */
-                    h245_add_to_graph(tapinfo, pinfo->fd->num);
+                    h245_add_to_graph(tapinfo, pinfo->num);
                     break;
                 }
             }
@@ -2004,7 +2004,7 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
         g_queue_push_tail(tapinfo->callsinfos, callsinfo);
     }
 
-    tapinfo->h225_frame_num = pinfo->fd->num;
+    tapinfo->h225_frame_num = pinfo->num;
     tapinfo->h225_call_num = callsinfo->call_num;
 
     /* let's analyze the call state */
@@ -2109,13 +2109,13 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
     /* add to graph analysis */
 
     /* if the frame number exists in graph, append to it*/
-    if (!append_to_frame_graph(tapinfo, pinfo->fd->num, pi->frame_label, comment)) {
+    if (!append_to_frame_graph(tapinfo, pinfo->num, pi->frame_label, comment)) {
         /* if not exist, add to the graph */
         add_to_graph(tapinfo, pinfo, edt, frame_label, comment, callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1);
     }
 
     /* Add the H245 info if exists to the Graph */
-    h245_add_to_graph(tapinfo, pinfo->fd->num);
+    h245_add_to_graph(tapinfo, pinfo->num);
 
     g_free(frame_label);
     g_free(comment);
@@ -2268,7 +2268,7 @@ h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
         /* increment the packets counter of all calls */
         ++(tapinfo->npackets);
         /* if the frame number exists in graph, append to it*/
-        if (!append_to_frame_graph(tapinfo, pinfo->fd->num, pi->frame_label, pi->comment)) {
+        if (!append_to_frame_graph(tapinfo, pinfo->num, pi->frame_label, pi->comment)) {
             /* if not exist, add to the graph */
             add_to_graph(tapinfo, pinfo, edt, pi->frame_label, pi->comment, callsinfo->call_num, &(pinfo->src), &(pinfo->dst), 1);
         }
@@ -2277,7 +2277,7 @@ h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
            tunnel OFF but we did not matched the h245 add, in this case nobady will set this label
            since the frame_num will not match */
 
-        h245_add_label(tapinfo, pinfo->fd->num, (gchar *) pi->frame_label, (gchar *) pi->comment);
+        h245_add_label(tapinfo, pinfo->num, (gchar *) pi->frame_label, (gchar *) pi->comment);
     }
 
     tapinfo->redraw |= REDRAW_H245DG;
@@ -2349,10 +2349,10 @@ sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _
        to use it later
      */
     g_free(tapinfo->sdp_summary);
-    tapinfo->sdp_frame_num = pinfo->fd->num;
+    tapinfo->sdp_frame_num = pinfo->num;
     /* Append to graph the SDP summary if the packet exists */
     tapinfo->sdp_summary = g_strdup_printf("SDP (%s)", pi->summary_str);
-    append_to_frame_graph(tapinfo, pinfo->fd->num, tapinfo->sdp_summary, NULL);
+    append_to_frame_graph(tapinfo, pinfo->num, tapinfo->sdp_summary, NULL);
 
     tapinfo->redraw |= REDRAW_SDP;
 
@@ -2722,8 +2722,8 @@ mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
     g_free(frame_label);
 
     /* add SDP info if apply */
-    if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->fd->num) ) {
-        append_to_frame_graph(tapinfo, pinfo->fd->num, tapinfo->sdp_summary, NULL);
+    if ( (tapinfo->sdp_summary != NULL) && (tapinfo->sdp_frame_num == pinfo->num) ) {
+        append_to_frame_graph(tapinfo, pinfo->num, tapinfo->sdp_summary, NULL);
         g_free(tapinfo->sdp_summary);
         tapinfo->sdp_summary = NULL;
     }
@@ -2796,7 +2796,7 @@ actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e
     voip_calls_info_t        *tmp_listinfo;
     voip_calls_info_t        *callsinfo = NULL;
 
-    tapinfo->actrace_frame_num = pinfo->fd->num;
+    tapinfo->actrace_frame_num = pinfo->num;
     tapinfo->actrace_trunk = pi->trunk;
     tapinfo->actrace_direction = pi->direction;
 
@@ -4092,7 +4092,7 @@ voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
     GList *list = NULL;
     const voip_packet_info_t *pi = (const voip_packet_info_t *)VoIPinfo;
 
-    /* VOIP_CALLS_DEBUG("num %u", pinfo->fd->num); */
+    /* VOIP_CALLS_DEBUG("num %u", pinfo->num); */
     if (pi->call_id)
         list = g_queue_peek_nth_link(tapinfo->callsinfos, 0);
     while (list) {
@@ -4206,7 +4206,7 @@ prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt
     if (callsinfo!=NULL) {
         callsinfo->stop_abs = pinfo->abs_ts;
         callsinfo->stop_rel = pinfo->rel_ts;
-        callsinfo->last_frame_num=pinfo->fd->num;
+        callsinfo->last_frame_num=pinfo->num;
         ++(callsinfo->npackets);
         ++(tapinfo->npackets);
     }