Dissectors should not use dfilter.h, don't include it.

XXX ncp2222 dissector is using dfilter_compile(), why?

svn path=/trunk/; revision=53766

14 files changed, 21 insertions, 6 deletions

diff --git a/color_filters.h b/color_filters.h
index 6e21a181a6..ef074d1ec1 100644
--- a/color_filters.h
+++ b/color_filters.h
@@ -43,7 +43,7 @@ typedef struct _color_filter {
     gboolean   selected;            /* set if the filter is selected in the color dialog box */
 
                                     /* only used inside of color_filters.c */
-    dfilter_t *c_colorfilter;       /* compiled filter expression */
+    struct epan_dfilter *c_colorfilter;  /* compiled filter expression */
 
                                     /* only used outside of color_filters.c (beside init) */
     void      *color_edit_dlg_info; /* if filter is being edited, ptr to req'd info */
diff --git a/epan/column-utils.c b/epan/column-utils.c
index f5cbbc39b3..db4c485e6f 100644
--- a/epan/column-utils.c
+++ b/epan/column-utils.c
@@ -61,7 +61,7 @@ col_setup(column_info *cinfo, const gint num_cols)
   cinfo->col_custom_field      = g_new(gchar*, num_cols);
   cinfo->col_custom_occurrence = g_new(gint, num_cols);
   cinfo->col_custom_field_id   = g_new(int, num_cols);
-  cinfo->col_custom_dfilter    = g_new(dfilter_t*, num_cols);
+  cinfo->col_custom_dfilter    = g_new(struct epan_dfilter*, num_cols);
   cinfo->col_data              = g_new(const gchar*, num_cols);
   cinfo->col_buf               = g_new(gchar*, num_cols);
   cinfo->col_fence             = g_new(int, num_cols);
diff --git a/epan/dissectors/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h
index edb4d97db6..dde8c4004e 100644
--- a/epan/dissectors/packet-ansi_a.h
+++ b/epan/dissectors/packet-ansi_a.h
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <epan/proto.h>
+
 typedef struct _ansi_a_tap_rec_t {
     /*
      * value from packet-bssap.h
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h
index 137105c72a..b1b42f835e 100644
--- a/epan/dissectors/packet-gsm_a_common.h
+++ b/epan/dissectors/packet-gsm_a_common.h
@@ -51,6 +51,8 @@
 #ifndef __PACKET_GSM_A_COMMON_H__
 #define __PACKET_GSM_A_COMMON_H__
 
+#include <epan/proto.h>
+
 #include "packet-sccp.h"
 #include "ws_symbol_export.h"
 
diff --git a/epan/dissectors/packet-ncp-int.h b/epan/dissectors/packet-ncp-int.h
index b7daacb15a..2bdc09815d 100644
--- a/epan/dissectors/packet-ncp-int.h
+++ b/epan/dissectors/packet-ncp-int.h
@@ -78,7 +78,7 @@ struct _sub_ptvc_record {
 
 typedef struct {
 	const char		*dfilter_text;
-	dfilter_t		*dfilter;
+	struct epan_dfilter	*dfilter;
 } conditional_record;
 
 typedef struct {
diff --git a/epan/dissectors/packet-radius.h b/epan/dissectors/packet-radius.h
index c85ace294c..e6a5c7cf9f 100644
--- a/epan/dissectors/packet-radius.h
+++ b/epan/dissectors/packet-radius.h
@@ -23,6 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <epan/proto.h>
+
 /* radius packet-type codes */
 /* 09/12/2011: Updated from IANA:
  * http://www.iana.org/assignments/radius-types/radius-types.xml#radius-types-27
diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h
index 73bcfe02a1..45f9b3fe80 100644
--- a/epan/dissectors/packet-smb.h
+++ b/epan/dissectors/packet-smb.h
@@ -28,6 +28,7 @@
 
 #include "ws_symbol_export.h"
 
+#include <epan/proto.h>
 #include <epan/wmem/wmem.h>
 
 WS_DLL_PUBLIC gboolean sid_name_snooping;
diff --git a/epan/dissectors/packet-wsp.h b/epan/dissectors/packet-wsp.h
index afafed666f..caf238c12d 100644
--- a/epan/dissectors/packet-wsp.h
+++ b/epan/dissectors/packet-wsp.h
@@ -30,6 +30,7 @@
 #ifndef __PACKET_WSP_H__
 #define __PACKET_WSP_H__
 
+#include <epan/proto.h>
 #include "ws_symbol_export.h"
 
 /* These reason codes are used in the WTP dissector as the WTP user is
diff --git a/epan/epan.c b/epan/epan.c
index 80a4648e73..e4d6be73ef 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -36,8 +36,10 @@
 #endif /* HAVE_LIBGNUTLS */
 
 #include <glib.h>
+
 #include "epan-int.h"
 #include "epan.h"
+#include "dfilter/dfilter.h"
 #include "epan_dissect.h"
 #include "wsutil/report_err.h"
 
diff --git a/epan/epan.h b/epan/epan.h
index 9347fb69f7..bae341d6e3 100644
--- a/epan/epan.h
+++ b/epan/epan.h
@@ -36,7 +36,7 @@ extern "C" {
 
 typedef struct _epan_dissect_t epan_dissect_t;
 
-#include "dfilter/dfilter.h"
+struct epan_dfilter;
 
 /**
 	@mainpage Wireshark EPAN the packet analyzing engine. Source code can be found in the epan directory
@@ -185,7 +185,7 @@ epan_dissect_run_with_taps(epan_dissect_t *edt, struct wtap_pkthdr *phdr,
 /** Prime a proto_tree using the fields/protocols used in a dfilter. */
 WS_DLL_PUBLIC
 void
-epan_dissect_prime_dfilter(epan_dissect_t *edt, const dfilter_t *dfcode);
+epan_dissect_prime_dfilter(epan_dissect_t *edt, const struct epan_dfilter *dfcode);
 
 /** fill the dissect run output into the packet list columns */
 WS_DLL_PUBLIC
diff --git a/epan/uat.h b/epan/uat.h
index aa2c5da030..0c22ba1dfb 100644
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -32,6 +32,8 @@
 
 #include <stdlib.h>
 
+#include <epan/emem.h>
+
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus
diff --git a/tools/ncp2222.py b/tools/ncp2222.py
index 9e07440d27..d5b07ed815 100755
--- a/tools/ncp2222.py
+++ b/tools/ncp2222.py
@@ -5737,6 +5737,7 @@ def produce_code():
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>
+#include <epan/dfilter/dfilter.h>
 #include <epan/exceptions.h>
 #include <ftypes/ftypes-int.h>
 #include <epan/to_str.h>
diff --git a/ui/gtk/color_edit_dlg.c b/ui/gtk/color_edit_dlg.c
index 0afdd00e58..24b34cef7b 100644
--- a/ui/gtk/color_edit_dlg.c
+++ b/ui/gtk/color_edit_dlg.c
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/packet.h>
+#include <epan/dfilter/dfilter.h>
 
 #include "../color.h"
 #include "../color_filters.h"
diff --git a/ui/gtk/gui_stat_menu.h b/ui/gtk/gui_stat_menu.h
index 57502b68a6..69c19f76ff 100644
--- a/ui/gtk/gui_stat_menu.h
+++ b/ui/gtk/gui_stat_menu.h
@@ -25,6 +25,8 @@
 #ifndef __GTK_STAT_MENU_H__
 #define __GTK_STAT_MENU_H__
 
+#include <epan/proto.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */