Avoid including <epan/epan.h> in dissectors.

svn path=/trunk/; revision=53774

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>

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.
  *

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

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

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>

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"

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>

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);
 

epan/print.h

@@ -29,6 +29,7 @@
 
 #include <stdio.h>
 
+#include <epan/epan.h>
 #include <epan/packet.h>
 
 #include <epan/packet-range.h>

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

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);

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.