diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 23:49:51 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-03 23:49:51 +0000 |
commit | b75354ebe8278c27c1c5e42897457c6e102fba0e (patch) | |
tree | 8d700171bc3f5f4d89a1e2f4c80989a57d3e49ea /epan | |
parent | 477add45062605028acf900e623ba001f69feb05 (diff) |
Avoid including <epan/epan.h> in dissectors.
svn path=/trunk/; revision=53774
Diffstat (limited to 'epan')
-rw-r--r-- | epan/column-utils.h | 7 | ||||
-rw-r--r-- | epan/dfilter/dfilter.h | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-frame.c | 1 | ||||
-rw-r--r-- | epan/epan_dissect.h | 1 | ||||
-rw-r--r-- | epan/frame_data.c | 1 | ||||
-rw-r--r-- | epan/packet.h | 3 | ||||
-rw-r--r-- | epan/print.h | 1 | ||||
-rw-r--r-- | epan/proto.h | 6 |
8 files changed, 15 insertions, 9 deletions
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 |