aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cfile.h1
-rw-r--r--color_filters.h6
-rw-r--r--epan/column-utils.h7
-rw-r--r--epan/dfilter/dfilter.h4
-rw-r--r--epan/dissectors/packet-frame.c1
-rw-r--r--epan/epan_dissect.h1
-rw-r--r--epan/frame_data.c1
-rw-r--r--epan/packet.h3
-rw-r--r--epan/print.h1
-rw-r--r--epan/proto.h6
-rw-r--r--ui/gtk/gui_stat_menu.h2
-rw-r--r--ui/gtk/packet_panes.h2
12 files changed, 22 insertions, 13 deletions
diff --git a/cfile.h b/cfile.h
index ebaf3c8fa9..b68ab371b9 100644
--- a/cfile.h
+++ b/cfile.h
@@ -25,6 +25,7 @@
#ifndef __CFILE_H__
#define __CFILE_H__
+#include <epan/epan.h>
#include <epan/dfilter/dfilter.h>
#include <epan/frame_data.h>
#include <epan/frame_data_sequence.h>
diff --git a/color_filters.h b/color_filters.h
index ef074d1ec1..4dc4ecbaff 100644
--- a/color_filters.h
+++ b/color_filters.h
@@ -28,6 +28,8 @@
extern "C" {
#endif /* __cplusplus */
+struct epan_dissect;
+
#define CONVERSATION_COLOR_PREFIX "___conversation_color_filter___"
/** @file
* Color filters.
@@ -98,7 +100,7 @@ color_filters_reset_tmp(void);
*
* @param the epan dissector details
*/
-void color_filters_prime_edt(epan_dissect_t *edt);
+void color_filters_prime_edt(struct epan_dissect *edt);
/** Colorize a specific packet.
*
@@ -106,7 +108,7 @@ void color_filters_prime_edt(epan_dissect_t *edt);
* @return the matching color filter or NULL
*/
const color_filter_t *
-color_filters_colorize_packet(epan_dissect_t *edt);
+color_filters_colorize_packet(struct epan_dissect *edt);
/** Clone the currently active filter list.
*
diff --git a/epan/column-utils.h b/epan/column-utils.h
index e2edd5641a..e892e51f37 100644
--- a/epan/column-utils.h
+++ b/epan/column-utils.h
@@ -29,13 +29,14 @@
#include "column-info.h"
#include "packet_info.h"
-#include <epan/epan.h>
#include "ws_symbol_export.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
+struct epan_dissect;
+
/** @file
* Helper routines for column utility structures and routines.
*/
@@ -154,11 +155,11 @@ WS_DLL_PUBLIC void col_add_fstr(column_info *cinfo, const gint col, const gchar
G_GNUC_PRINTF(3, 4);
/** For internal Wireshark use only. Not to be called from dissectors. */
-void col_custom_set_edt(epan_dissect_t *edt, column_info *cinfo);
+void col_custom_set_edt(struct epan_dissect *edt, column_info *cinfo);
/** For internal Wireshark use only. Not to be called from dissectors. */
WS_DLL_PUBLIC
-void col_custom_prime_edt(epan_dissect_t *edt, column_info *cinfo);
+void col_custom_prime_edt(struct epan_dissect *edt, column_info *cinfo);
/** For internal Wireshark use only. Not to be called from dissectors. */
WS_DLL_PUBLIC
diff --git a/epan/dfilter/dfilter.h b/epan/dfilter/dfilter.h
index 94bd672317..b798a20f1a 100644
--- a/epan/dfilter/dfilter.h
+++ b/epan/dfilter/dfilter.h
@@ -35,6 +35,8 @@ typedef struct epan_dfilter dfilter_t;
extern "C" {
#endif /* __cplusplus */
+struct epan_dissect;
+
/* Module-level initialization */
void
dfilter_init(void);
@@ -80,7 +82,7 @@ WS_DLL_PUBLIC const gchar *dfilter_error_msg;
/* Apply compiled dfilter */
WS_DLL_PUBLIC
gboolean
-dfilter_apply_edt(dfilter_t *df, epan_dissect_t* edt);
+dfilter_apply_edt(dfilter_t *df, struct epan_dissect *edt);
/* Apply compiled dfilter */
gboolean
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 1b4225514f..01f5e3e88d 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -33,6 +33,7 @@
#include <wsutil/md5.h>
+#include <epan/epan.h>
#include <epan/packet.h>
#include <epan/exceptions.h>
#include <epan/show_exception.h>
diff --git a/epan/epan_dissect.h b/epan/epan_dissect.h
index 7c23c125a1..ea1a825c6b 100644
--- a/epan/epan_dissect.h
+++ b/epan/epan_dissect.h
@@ -28,6 +28,7 @@
extern "C" {
#endif /* __cplusplus */
+#include "epan.h"
#include "tvbuff.h"
#include "proto.h"
#include "packet_info.h"
diff --git a/epan/frame_data.c b/epan/frame_data.c
index 4957347364..5bee4f3d17 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -27,6 +27,7 @@
#include <glib.h>
+#include <epan/epan.h>
#include <wiretap/wtap.h>
#include <epan/frame_data.h>
#include <epan/packet.h>
diff --git a/epan/packet.h b/epan/packet.h
index 997ee93caa..205df7ff3b 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -32,7 +32,6 @@
#include "frame_data.h"
#include "packet_info.h"
#include "column-utils.h"
-#include "epan.h"
#include "tfs.h"
#include "ws_symbol_export.h"
#include "range.h"
@@ -508,7 +507,7 @@ WS_DLL_PUBLIC void mark_frame_as_depended_upon(packet_info *pinfo, guint32 frame
/*
* Dissectors should never modify the packet data.
*/
-extern void dissect_packet(epan_dissect_t *edt,
+extern void dissect_packet(struct epan_dissect *edt,
struct wtap_pkthdr *phdr, tvbuff_t *tvb,
frame_data *fd, column_info *cinfo);
diff --git a/epan/print.h b/epan/print.h
index e6c2ad8f43..ae8315ec1f 100644
--- a/epan/print.h
+++ b/epan/print.h
@@ -29,6 +29,7 @@
#include <stdio.h>
+#include <epan/epan.h>
#include <epan/packet.h>
#include <epan/packet-range.h>
diff --git a/epan/proto.h b/epan/proto.h
index 0578325d17..a9841a9899 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -1888,21 +1888,21 @@ hfinfo_bitwidth(const header_field_info *hfinfo);
WS_DLL_PUBLIC int
hfinfo_bitshift(const header_field_info *hfinfo);
-#include "epan.h"
+struct epan_dissect;
/** Can we do a "match selected" on this field.
@param finfo field_info
@param edt epan dissecting
@return TRUE if we can do a "match selected" on the field, FALSE otherwise. */
WS_DLL_PUBLIC gboolean
-proto_can_match_selected(field_info *finfo, epan_dissect_t *edt);
+proto_can_match_selected(field_info *finfo, struct epan_dissect *edt);
/** Construct a "match selected" display filter string.
@param finfo field_info
@param edt epan dissecting
@return the display filter string */
WS_DLL_PUBLIC char*
-proto_construct_match_selected_string(field_info *finfo, epan_dissect_t *edt);
+proto_construct_match_selected_string(field_info *finfo, struct epan_dissect *edt);
/** Find field from offset in tvb.
@param tree tree of interest
diff --git a/ui/gtk/gui_stat_menu.h b/ui/gtk/gui_stat_menu.h
index 69c19f76ff..dd817b4cb3 100644
--- a/ui/gtk/gui_stat_menu.h
+++ b/ui/gtk/gui_stat_menu.h
@@ -76,7 +76,7 @@ void register_menu_bar_menu_items(
gpointer callback,
gpointer callback_data,
gboolean enabled,
- gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *, gpointer callback_data),
+ gboolean (*selected_packet_enabled)(frame_data *, struct epan_dissect *, gpointer callback_data),
gboolean (*selected_tree_row_enabled)(field_info *, gpointer callback_data));
void eth_endpoints_cb(GtkAction *action, gpointer user_data);
diff --git a/ui/gtk/packet_panes.h b/ui/gtk/packet_panes.h
index a9b756d40f..48bd3aad12 100644
--- a/ui/gtk/packet_panes.h
+++ b/ui/gtk/packet_panes.h
@@ -85,7 +85,7 @@ extern GtkWidget *add_byte_tab(GtkWidget *byte_nb, const char *name,
* @param tree_view the corresponding packet tree
* @param nb_ptr the byte view notebook
*/
-extern void add_byte_views(epan_dissect_t *edt, GtkWidget *tree_view,
+extern void add_byte_views(struct epan_dissect *edt, GtkWidget *tree_view,
GtkWidget *nb_ptr);
/** Gdk button click appeared, select the byte view from that position.