Dissectors should not use dfilter.h, don't include it.
XXX ncp2222 dissector is using dfilter_compile(), why? svn path=/trunk/; revision=53766
This commit is contained in:
parent
82f1fecf14
commit
cedb73c7f7
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <epan/emem.h>
|
||||
|
||||
#include "ws_symbol_export.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include <epan/dfilter/dfilter.h>
|
||||
|
||||
#include "../color.h"
|
||||
#include "../color_filters.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 */
|
||||
|
|
Loading…
Reference in New Issue