Add wtap_pseudo_header union to wtap_pkthdr structure.

Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601

10 files changed, 25 insertions, 26 deletions

diff --git a/ui/gtk/iax2_analysis.c b/ui/gtk/iax2_analysis.c
index 8d569777c3..d284c71ca4 100644
--- a/ui/gtk/iax2_analysis.c
+++ b/ui/gtk/iax2_analysis.c
@@ -3633,7 +3633,7 @@ void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 		return;	/* error reading the frame */
 	epan_dissect_init(&edt, TRUE, FALSE);
 	epan_dissect_prime_dfilter(&edt, sfcode);
-	epan_dissect_run(&edt, &cf->pseudo_header, cf->pd, fdata, NULL);
+	epan_dissect_run(&edt, &cf->phdr, cf->pd, fdata, NULL);
 
 	/* if it is not an iax2 frame, show an error dialog */
 	frame_matched = dfilter_apply_edt(sfcode, &edt);
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index 5e83697c08..7997cc367c 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -550,7 +550,7 @@ get_ip_address_list_from_packet_list_row(gpointer data)
         epan_dissect_init(&edt, FALSE, FALSE);
         col_custom_prime_edt(&edt, &cfile.cinfo);
 
-        epan_dissect_run(&edt, &cfile.pseudo_header, cfile.pd, fdata, &cfile.cinfo);
+        epan_dissect_run(&edt, &cfile.phdr, cfile.pd, fdata, &cfile.cinfo);
         epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
 
         /* First check selected column */
@@ -590,8 +590,7 @@ get_filter_from_packet_list_row_and_column(gpointer data)
         epan_dissect_init(&edt, have_custom_cols(&cfile.cinfo), FALSE);
         col_custom_prime_edt(&edt, &cfile.cinfo);
 
-        epan_dissect_run(&edt, &cfile.pseudo_header, cfile.pd, fdata,
-                 &cfile.cinfo);
+        epan_dissect_run(&edt, &cfile.phdr, cfile.pd, fdata, &cfile.cinfo);
         epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
 
         if ((cfile.cinfo.col_custom_occurrence[column]) ||
diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index 600f3a6d21..d10e7fb356 100644
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -1139,7 +1139,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
 	column_info *cinfo;
 	gint col;
 	gboolean create_proto_tree;
-	union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */
+	struct wtap_pkthdr phdr; /* Packet header */
 	guint8 pd[WTAP_MAX_PACKET_SIZE];  /* Packet data */
 
 	g_return_if_fail(packet_list);
@@ -1160,7 +1160,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
 	else
 		cinfo = NULL;
 
-	if (!cf_read_frame_r(&cfile, fdata, &pseudo_header, pd)) {
+	if (!cf_read_frame_r(&cfile, fdata, &phdr, pd)) {
 		/*
 		 * Error reading the frame.
 		 *
@@ -1201,7 +1201,7 @@ packet_list_dissect_and_cache_record(PacketList *packet_list, PacketListRecord *
 	 * XXX - need to catch an OutOfMemoryError exception and
 	 * attempt to recover from it.
 	 */
-	epan_dissect_run(&edt, &pseudo_header, pd, fdata, cinfo);
+	epan_dissect_run(&edt, &phdr, pd, fdata, cinfo);
 
 	if (dissect_color)
 		fdata->color_filter = color_filters_colorize_packet(&edt);
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c
index e350cf9422..da9183d1b7 100644
--- a/ui/gtk/packet_win.c
+++ b/ui/gtk/packet_win.c
@@ -74,8 +74,8 @@
 /* Data structure holding information about a packet-detail window. */
 struct PacketWinData {
 	frame_data *frame;	   /* The frame being displayed */
-	union wtap_pseudo_header pseudo_header; /* Pseudo-header for packet */
-	guint8     *pd;		   /* Data for packet */
+	struct wtap_pkthdr phdr;   /* Packet header */
+	guint8     *pd;		   /* Packet data */
 	GtkWidget  *main;
 	GtkWidget  *tv_scrollw;
 	GtkWidget  *tree_view;
@@ -90,8 +90,8 @@ struct PacketWinData {
 #ifdef WANT_PACKET_EDITOR
 struct FieldinfoWinData {
 	frame_data *frame;	   /* The frame being displayed */
-	union wtap_pseudo_header pseudo_header; /* Pseudo-header for packet */
-	guint8     *pd;		   /* Data for packet */
+	struct wtap_pkthdr phdr;   /* Packet header */
+	guint8     *pd;		   /* Packet data */
 	int start_offset;
 
 	field_info *finfo;
@@ -222,7 +222,7 @@ finfo_window_refresh(struct FieldinfoWinData *DataPtr)
 	if (old_finfo->hfinfo)
 		proto_tree_prime_hfid(edt.tree, old_finfo->hfinfo->id);
 	*/
-	epan_dissect_run(&edt, &DataPtr->pseudo_header, DataPtr->pd, DataPtr->frame, NULL);
+	epan_dissect_run(&edt, &DataPtr->phdr, DataPtr->pd, DataPtr->frame, NULL);
 
 	/* Try to find finfo which looks like old_finfo.
 	 * We might not found one, if protocol requires specific magic values, etc... */
@@ -667,7 +667,7 @@ edit_pkt_tree_row_activated_cb(GtkTreeView *tree_view, GtkTreePath *path, GtkTre
 		struct FieldinfoWinData data;
 
 		data.frame = DataPtr->frame;
-		data.pseudo_header = DataPtr->pseudo_header;
+		data.phdr  = DataPtr->phdr;
 		data.pd = g_memdup(DataPtr->pd, DataPtr->frame->cap_len);
 		data.start_offset = (int) (finfo->ds_tvb->real_data - DataPtr->pd);
 
@@ -679,13 +679,13 @@ edit_pkt_tree_row_activated_cb(GtkTreeView *tree_view, GtkTreePath *path, GtkTre
 		data.pd_bitoffset = 0;
 
 		if (new_finfo_window(DataPtr->main, &data) == GTK_RESPONSE_ACCEPT) {
-			/* DataPtr->pseudo_header = data.pseudo_header; */
+			/* DataPtr->phdr = data.phdr; */
 			memcpy(DataPtr->pd, data.pd, DataPtr->frame->cap_len);
 
 			proto_tree_draw(NULL, DataPtr->tree_view);
 			epan_dissect_cleanup(&(DataPtr->edt));
 			epan_dissect_init(&(DataPtr->edt), TRUE, TRUE);
-			epan_dissect_run(&(DataPtr->edt), &DataPtr->pseudo_header, DataPtr->pd, DataPtr->frame, NULL);
+			epan_dissect_run(&(DataPtr->edt), &DataPtr->phdr, DataPtr->pd, DataPtr->frame, NULL);
 			add_byte_views(&(DataPtr->edt), DataPtr->tree_view, DataPtr->bv_nb_ptr);
 			proto_tree_draw(DataPtr->edt.tree, DataPtr->tree_view);
 		}
@@ -808,7 +808,7 @@ edit_pkt_win_key_pressed_cb(GtkWidget *win _U_, GdkEventKey *event, gpointer use
 		proto_tree_draw(NULL, DataPtr->tree_view);
 		epan_dissect_cleanup(&(DataPtr->edt));
 		epan_dissect_init(&(DataPtr->edt), TRUE, TRUE);
-		epan_dissect_run(&(DataPtr->edt), &DataPtr->pseudo_header, DataPtr->pd, DataPtr->frame, NULL);
+		epan_dissect_run(&(DataPtr->edt), &DataPtr->phdr, DataPtr->pd, DataPtr->frame, NULL);
 		add_byte_views(&(DataPtr->edt), DataPtr->tree_view, DataPtr->bv_nb_ptr);
 		proto_tree_draw(DataPtr->edt.tree, DataPtr->tree_view);
 	}
@@ -892,12 +892,12 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_)
 	DataPtr = (struct PacketWinData *) g_malloc(sizeof(struct PacketWinData));
 
 	DataPtr->frame = cfile.current_frame;
-	memcpy(&DataPtr->pseudo_header, &cfile.pseudo_header, sizeof DataPtr->pseudo_header);
+	DataPtr->phdr  = cfile.phdr;
 	DataPtr->pd = g_malloc(DataPtr->frame->cap_len);
 	memcpy(DataPtr->pd, cfile.pd, DataPtr->frame->cap_len);
 
 	epan_dissect_init(&(DataPtr->edt), TRUE, TRUE);
-	epan_dissect_run(&(DataPtr->edt), &DataPtr->pseudo_header, DataPtr->pd,
+	epan_dissect_run(&(DataPtr->edt), &DataPtr->phdr, DataPtr->pd,
 			 DataPtr->frame, &cfile.cinfo);
 	epan_dissect_fill_in_columns(&(DataPtr->edt), FALSE, TRUE);
 
@@ -975,7 +975,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_)
 		modified_frame_data *mfd = g_malloc(sizeof(modified_frame_data));
 
 		mfd->pd = DataPtr->pd;
-		mfd->ph = DataPtr->pseudo_header;
+		mfd->phdr = DataPtr->phdr;
 
 		if (cfile.edited_frames == NULL)
 			cfile.edited_frames = g_tree_new_full(g_direct_compare_func, NULL, NULL, modifed_frame_data_free);
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c
index f44ec9ec88..33510c1355 100644
--- a/ui/gtk/rlc_lte_graph.c
+++ b/ui/gtk/rlc_lte_graph.c
@@ -928,7 +928,7 @@ static rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf, struct segment
     epan_dissect_init(&edt, TRUE, FALSE);
     epan_dissect_prime_dfilter(&edt, sfcode);
     tap_queue_init(&edt);
-    epan_dissect_run(&edt, &cf->pseudo_header, cf->pd, fdata, NULL);
+    epan_dissect_run(&edt, &cf->phdr, cf->pd, fdata, NULL);
     tap_push_tapped_queue(&edt);
     epan_dissect_cleanup(&edt);
     remove_tap_listener(&th);
diff --git a/ui/gtk/rtp_analysis.c b/ui/gtk/rtp_analysis.c
index 858bd01e0b..4ee4eb6a86 100644
--- a/ui/gtk/rtp_analysis.c
+++ b/ui/gtk/rtp_analysis.c
@@ -3807,7 +3807,7 @@ void rtp_analysis_cb(GtkAction *action _U_, gpointer user_data _U_)
 		return;	/* error reading the frame */
 	epan_dissect_init(&edt, TRUE, FALSE);
 	epan_dissect_prime_dfilter(&edt, sfcode);
-	epan_dissect_run(&edt, &cf->pseudo_header, cf->pd, fdata, NULL);
+	epan_dissect_run(&edt, &cf->phdr, cf->pd, fdata, NULL);
 
 	/* if it is not an rtp frame, show the rtpstream dialog */
 	frame_matched = dfilter_apply_edt(sfcode, &edt);
diff --git a/ui/gtk/sctp_assoc_analyse.c b/ui/gtk/sctp_assoc_analyse.c
index 615b9807e1..de61d76de4 100644
--- a/ui/gtk/sctp_assoc_analyse.c
+++ b/ui/gtk/sctp_assoc_analyse.c
@@ -880,7 +880,7 @@ static void sctp_analyse_cb(struct sctp_analyse* u_data, gboolean ext)
 
 	epan_dissect_init(&edt, TRUE, FALSE);
 	epan_dissect_prime_dfilter(&edt, sfcode);
-	epan_dissect_run(&edt, &cf->pseudo_header, cf->pd, fdata, NULL);
+	epan_dissect_run(&edt, &cf->phdr, cf->pd, fdata, NULL);
 	frame_matched = dfilter_apply_edt(sfcode, &edt);
 
 	/* if it is not an sctp frame, show the dialog */
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index 324070164f..eb53152a49 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -1936,7 +1936,7 @@ static struct tcpheader *select_tcpip_session (capture_file *cf, struct segment
 	epan_dissect_init(&edt, TRUE, FALSE);
 	epan_dissect_prime_dfilter(&edt, sfcode);
 	tap_queue_init(&edt);
-	epan_dissect_run(&edt, &cf->pseudo_header, cf->pd, fdata, NULL);
+	epan_dissect_run(&edt, &cf->phdr, cf->pd, fdata, NULL);
 	tap_push_tapped_queue(&edt);
 	epan_dissect_cleanup(&edt);
 	remove_tap_listener(&th);
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index c40a84d3b8..71cb19f71f 100644
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -165,7 +165,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
     epan_dissect_t edt;
     column_info *cinfo;
     gboolean create_proto_tree;
-    union wtap_pseudo_header pseudo_header; /* Packet pseudo_header */
+    struct wtap_pkthdr phdr; /* Packet header */
     guint8 pd[WTAP_MAX_PACKET_SIZE];  /* Packet data */
     gboolean dissect_columns = TRUE; // XXX - Currently only a placeholder
 
@@ -214,7 +214,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
     if (dissect_columns)
         col_custom_prime_edt(&edt, cinfo);
 
-    epan_dissect_run(&edt, &pseudo_header, pd, fdata, cinfo);
+    epan_dissect_run(&edt, &phdr, pd, fdata, cinfo);
 
     if (enable_color_)
         fdata->color_filter = color_filters_colorize_packet(&edt);
diff --git a/ui/text_import.c b/ui/text_import.c
index 912022425e..c8a122f4ba 100644
--- a/ui/text_import.c
+++ b/ui/text_import.c
@@ -531,7 +531,7 @@ write_current_packet (void)
 			pkthdr.pack_flags = 0;
 			pkthdr.presence_flags = WTAP_HAS_CAP_LEN|WTAP_HAS_INTERFACE_ID|WTAP_HAS_TS;
 
-            wtap_dump(wdh, &pkthdr, NULL, packet_buf, &err);
+            wtap_dump(wdh, &pkthdr, packet_buf, &err);
         }
     }