diff options
51 files changed, 93 insertions, 21 deletions
diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index a0b7089338..208e28d56b 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -28,6 +28,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/asn1.h> #include "packet-per.h" @@ -28,6 +28,7 @@ #include <epan/dfilter/dfilter.h> #include <epan/frame_data.h> #include <epan/frame_data_sequence.h> +#include <wiretap/wtap.h> #ifdef __cplusplus extern "C" { @@ -54,6 +55,14 @@ typedef enum { SD_BACKWARD } search_direction; +#ifdef WANT_PACKET_EDITOR +/* XXX, where this struct should go? */ +typedef struct { + struct wtap_pkthdr phdr; /**< Modified packet header */ + char *pd; /**< Modified packet data */ +} modified_frame_data; +#endif + typedef struct _capture_file { epan_t *epan; file_state state; /* Current state of capture file */ diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 16c7491214..49a4c3ecde 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -28,6 +28,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include "packet-arcnet.h" #include <epan/arcnet_pids.h> #include "packet-ip.h" diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c index 20ec93aabb..e1733126d6 100644 --- a/epan/dissectors/packet-ascend.c +++ b/epan/dissectors/packet-ascend.c @@ -24,7 +24,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> void proto_register_ascend(void); void proto_reg_handoff_acend(void); diff --git a/epan/dissectors/packet-ax25-kiss.c b/epan/dissectors/packet-ax25-kiss.c index c545627d86..7d08c84073 100644 --- a/epan/dissectors/packet-ax25-kiss.c +++ b/epan/dissectors/packet-ax25-kiss.c @@ -106,6 +106,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/wmem/wmem.h> #include "packet-ax25-kiss.h" diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index fba9186203..be23576ff1 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -49,6 +49,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/to_str.h> #include <epan/wmem/wmem.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index b8fc4e7958..a4e2c7269a 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -29,6 +29,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include "packet-bluetooth-hci.h" diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c index c114a95516..2dc7d6ca04 100644 --- a/epan/dissectors/packet-clip.c +++ b/epan/dissectors/packet-clip.c @@ -28,7 +28,10 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> + #include "packet-clip.h" #include "packet-ip.h" diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c index 8e8381f8b8..00a8babc3a 100644 --- a/epan/dissectors/packet-cosine.c +++ b/epan/dissectors/packet-cosine.c @@ -32,7 +32,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> void proto_register_cosine(void); void proto_reg_handoff_cosine(void); diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index 9e5a37acf3..dbb0a6360e 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -30,6 +30,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/expert.h> #include <epan/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-dpnss-link.c b/epan/dissectors/packet-dpnss-link.c index 66f5b54b41..214c45e8c9 100644 --- a/epan/dissectors/packet-dpnss-link.c +++ b/epan/dissectors/packet-dpnss-link.c @@ -32,6 +32,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> void proto_register_dpnss_link(void); void proto_reg_handoff_dpnss_link(void); diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 0cb7e107b3..400597e5bc 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -28,6 +28,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/to_str.h> #include <epan/tap.h> #include <epan/exported_pdu.h> diff --git a/epan/dissectors/packet-fp_hint.c b/epan/dissectors/packet-fp_hint.c index 0ac4c5c550..5fe0ae9294 100644 --- a/epan/dissectors/packet-fp_hint.c +++ b/epan/dissectors/packet-fp_hint.c @@ -26,7 +26,9 @@ #include <string.h> #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/wmem/wmem.h> #include <epan/conversation.h> #include "packet-umts_fp.h" diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index a72657f6b9..da47632c54 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -25,6 +25,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/wmem/wmem.h> #include "packet-bluetooth-hci.h" diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c index 1b79e3e508..5f6de54ca5 100644 --- a/epan/dissectors/packet-hci_h4.c +++ b/epan/dissectors/packet-hci_h4.c @@ -31,6 +31,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/wmem/wmem.h> #include "packet-bluetooth-hci.h" diff --git a/epan/dissectors/packet-ieee80211-airopeek.c b/epan/dissectors/packet-ieee80211-airopeek.c index cfc8a6005a..de908831e3 100644 --- a/epan/dissectors/packet-ieee80211-airopeek.c +++ b/epan/dissectors/packet-ieee80211-airopeek.c @@ -25,6 +25,8 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> + #include "packet-ieee80211.h" static dissector_handle_t ieee80211_handle; diff --git a/epan/dissectors/packet-ieee80211-netmon.c b/epan/dissectors/packet-ieee80211-netmon.c index 49af188066..bcfe465690 100644 --- a/epan/dissectors/packet-ieee80211-netmon.c +++ b/epan/dissectors/packet-ieee80211-netmon.c @@ -28,6 +28,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> /* protocol */ static int proto_netmon_802_11 = -1; diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c index ed8fa6fe65..4d2a237326 100644 --- a/epan/dissectors/packet-ieee80211-prism.c +++ b/epan/dissectors/packet-ieee80211-prism.c @@ -27,8 +27,10 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/wmem/wmem.h> + #include "packet-ieee80211.h" #define SHORT_STR 256 diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 48fd6b6ed3..0f1c546de9 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -27,6 +27,8 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> + #include "packet-ieee80211.h" static dissector_handle_t ieee80211_handle; diff --git a/epan/dissectors/packet-ieee80211-wlancap.c b/epan/dissectors/packet-ieee80211-wlancap.c index 4f898f62f8..a76495255b 100644 --- a/epan/dissectors/packet-ieee80211-wlancap.c +++ b/epan/dissectors/packet-ieee80211-wlancap.c @@ -27,7 +27,9 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include <wsutil/pint.h> + #include "packet-ieee80211.h" static dissector_handle_t ieee80211_handle; diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index 3f3823f95b..d2effc366b 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -43,6 +43,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> /* General-purpose debug logger. * Requires double parentheses because of variable arguments of printf(). diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c index b07e616009..17be670dce 100644 --- a/epan/dissectors/packet-ipfc.c +++ b/epan/dissectors/packet-ipfc.c @@ -31,9 +31,11 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/to_str.h> #include <epan/etypes.h> #include <epan/conversation.h> + #include "packet-scsi.h" #include "packet-fc.h" #include "packet-ipfc.h" diff --git a/epan/dissectors/packet-ipnet.c b/epan/dissectors/packet-ipnet.c index 1a8daebcda..459ca88a82 100644 --- a/epan/dissectors/packet-ipnet.c +++ b/epan/dissectors/packet-ipnet.c @@ -25,8 +25,10 @@ #include "config.h" #include <glib.h> + #include <epan/aftypes.h> #include <epan/packet.h> +#include <wiretap/wtap.h> static int proto_ipnet = -1; static int hf_version = -1; diff --git a/epan/dissectors/packet-ipoib.c b/epan/dissectors/packet-ipoib.c index cd156d2189..363b4545ac 100644 --- a/epan/dissectors/packet-ipoib.c +++ b/epan/dissectors/packet-ipoib.c @@ -26,8 +26,10 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> #include <epan/etypes.h> +#include <wiretap/wtap.h> static int proto_ipoib = -1; static int hf_type = -1; diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 939ddf35c8..015b03d749 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -27,7 +27,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/crc32-tvb.h> #include <epan/wmem/wmem.h> diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index dca9a6a3c4..c6711824c9 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -34,6 +34,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index 860eba23b2..b257b4a0cc 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -26,7 +26,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/xdlc.h> static int proto_lapb = -1; diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 415f34368a..dfab61aba3 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -26,7 +26,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/oui.h> #include <epan/xdlc.h> diff --git a/epan/dissectors/packet-meta.c b/epan/dissectors/packet-meta.c index fe94bdc031..3089d80543 100644 --- a/epan/dissectors/packet-meta.c +++ b/epan/dissectors/packet-meta.c @@ -26,7 +26,9 @@ #include <string.h> #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/expert.h> #include <epan/wmem/wmem.h> diff --git a/epan/dissectors/packet-mime-encap.c b/epan/dissectors/packet-mime-encap.c index dac1683b77..d5109e96dc 100644 --- a/epan/dissectors/packet-mime-encap.c +++ b/epan/dissectors/packet-mime-encap.c @@ -24,7 +24,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include "tvbuff-int.h" diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index d7a60e4e4e..d9a7980646 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -29,7 +29,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/rtp_pt.h> diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index 0b64404126..e5ec8a7ec5 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -36,6 +36,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/asn1.h> #include "packet-per.h" @@ -95,7 +96,7 @@ static int hf_mpeg_pes_frame_type = -1; /* T_frame_type */ static int hf_mpeg_pes_vbv_delay = -1; /* BIT_STRING_SIZE_16 */ /*--- End of included file: packet-mpeg-pes-hf.c ---*/ -#line 36 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 37 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-ett.c ---*/ #line 1 "../../asn1/mpeg-pes/packet-mpeg-pes-ett.c" @@ -107,7 +108,7 @@ static gint ett_mpeg_pes_Group_of_pictures = -1; static gint ett_mpeg_pes_Picture = -1; /*--- End of included file: packet-mpeg-pes-ett.c ---*/ -#line 37 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 38 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" /*--- Included file: packet-mpeg-pes-fn.c ---*/ #line 1 "../../asn1/mpeg-pes/packet-mpeg-pes-fn.c" @@ -475,7 +476,7 @@ dissect_mpeg_pes_Picture(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /*--- End of included file: packet-mpeg-pes-fn.c ---*/ -#line 38 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 39 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" static int proto_mpeg = -1; static int proto_mpeg_pes = -1; @@ -1200,7 +1201,7 @@ proto_register_mpeg_pes(void) "BIT_STRING_SIZE_16", HFILL }}, /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/ -#line 558 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 559 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" { &hf_mpeg_pes_pack_header, { "Pack header", "mpeg-pes.pack", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, @@ -1318,7 +1319,7 @@ proto_register_mpeg_pes(void) &ett_mpeg_pes_Picture, /*--- End of included file: packet-mpeg-pes-ettarr.c ---*/ -#line 665 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" +#line 666 "../../asn1/mpeg-pes/packet-mpeg-pes-template.c" &ett_mpeg_pes_pack_header, &ett_mpeg_pes_header_data, &ett_mpeg_pes_trick_mode diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index e15c4923ac..ad5fc146c0 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -36,6 +36,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/oui.h> #include <epan/llcsaps.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c index f1a80766eb..2cf3eee0d5 100644 --- a/epan/dissectors/packet-mux27010.c +++ b/epan/dissectors/packet-mux27010.c @@ -26,7 +26,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/reassemble.h> #include <epan/crc8-tvb.h> #include <expert.h> diff --git a/epan/dissectors/packet-netanalyzer.c b/epan/dissectors/packet-netanalyzer.c index ce4002c10f..27c8cf5214 100644 --- a/epan/dissectors/packet-netanalyzer.c +++ b/epan/dissectors/packet-netanalyzer.c @@ -59,7 +59,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/wmem/wmem.h> #include <expert.h> diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c index accb5993dd..83378e3caa 100644 --- a/epan/dissectors/packet-packetlogger.c +++ b/epan/dissectors/packet-packetlogger.c @@ -27,6 +27,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #define PNAME "PacketLogger" #define PSNAME "PKTLOG" diff --git a/epan/dissectors/packet-peekremote.c b/epan/dissectors/packet-peekremote.c index 831894beb7..727dc8cf30 100644 --- a/epan/dissectors/packet-peekremote.c +++ b/epan/dissectors/packet-peekremote.c @@ -52,7 +52,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> static int proto_peekremote = -1; static gint hf_peekremote_unknown1 = -1; diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c index f5b9a1c8d8..48a0cf694d 100644 --- a/epan/dissectors/packet-redback.c +++ b/epan/dissectors/packet-redback.c @@ -28,7 +28,10 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> + #include "packet-ip.h" static dissector_handle_t redback_handle; diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 412c506a46..eb7fa85074 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -25,7 +25,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/xdlc.h> /* diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index c463d471ab..db49e62e9d 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -28,7 +28,7 @@ #include <glib.h> #include <epan/packet.h> - +#include <wiretap/wtap.h> #include <epan/etypes.h> static dissector_table_t ethertype_dissector_table; diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index 381d02ca9b..ef65f50487 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -31,6 +31,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> /* * See diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 6061a01031..3f879e587d 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -30,7 +30,9 @@ #include "config.h" #include <glib.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #define SOH (0x01) #define STX (0x02) diff --git a/epan/dissectors/packet-v5ef.c b/epan/dissectors/packet-v5ef.c index bd130787b5..458ba9789a 100644 --- a/epan/dissectors/packet-v5ef.c +++ b/epan/dissectors/packet-v5ef.c @@ -36,6 +36,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/conversation.h> #include <epan/xdlc.h> #include <epan/crc16-tvb.h> diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index 9d411d3e27..1f03ba0296 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -101,7 +101,9 @@ #include <stdio.h> #include <glib.h> #include <string.h> + #include <epan/packet.h> +#include <wiretap/wtap.h> #include <wsutil/pint.h> #include <epan/circuit.h> #include <epan/wmem/wmem.h> diff --git a/epan/frame_data.h b/epan/frame_data.h index 2755593be6..d5e0caea9b 100644 --- a/epan/frame_data.h +++ b/epan/frame_data.h @@ -28,9 +28,12 @@ #include <epan/column-info.h> #include <epan/tvbuff.h> #include <wsutil/nstime.h> -#include <wiretap/wtap.h> #include "ws_symbol_export.h" +struct _packet_info; +struct epan_session; +struct wtap_pkthdr; + #define PINFO_FD_NUM(pinfo) ((pinfo)->fd->num) #define PINFO_FD_VISITED(pinfo) ((pinfo)->fd->flags.visited) @@ -86,25 +89,12 @@ typedef struct _frame_data { guint32 prev_dis_num; /**< Previous displayed frame (0 if first one) */ } frame_data; -#ifdef WANT_PACKET_EDITOR -/* XXX, where this struct should go? */ -typedef struct { - struct wtap_pkthdr phdr; /**< Modified packet header */ - char *pd; /**< Modified packet data */ -} modified_frame_data; -#endif - /* Utility routines used by packet*.c */ -struct _packet_info; - WS_DLL_PUBLIC void p_add_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key, void *proto_data); WS_DLL_PUBLIC void *p_get_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); void p_remove_proto_data(wmem_allocator_t *scope, struct _packet_info* pinfo, int proto, guint32 key); gchar *p_get_proto_name_and_key(wmem_allocator_t *scope, struct _packet_info* pinfo, guint pfd_index); -/* no sense to include epan.h + dependencies for opaque epan session type */ -struct epan_session; - /** compare two frame_datas */ WS_DLL_PUBLIC gint frame_data_compare(const struct epan_session *epan, const frame_data *fdata1, const frame_data *fdata2, int field); diff --git a/epan/packet.h b/epan/packet.h index 78531c18ed..2e2ca041f0 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -25,7 +25,6 @@ #ifndef __PACKET_H__ #define __PACKET_H__ -#include "wiretap/wtap.h" #include "proto.h" #include "tvbuff.h" #include "value_string.h" diff --git a/frame_tvbuff.h b/frame_tvbuff.h index 7649dc9503..be0cb489fe 100644 --- a/frame_tvbuff.h +++ b/frame_tvbuff.h @@ -29,6 +29,8 @@ extern "C" { #endif /* __cplusplus */ +#include <wiretap/wtap.h> + extern tvbuff_t *frame_tvbuff_new(const frame_data *fd, const guint8 *buf); extern tvbuff_t *frame_tvbuff_new_buffer(const frame_data *fd, Buffer *buf); diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 13e0073417..7d73332ce0 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -48,6 +48,7 @@ #include "config.h" #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/exceptions.h> void proto_register_docsis(void); diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 4e245239b5..584c1afa5e 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -33,6 +33,7 @@ #include <glib.h> #include <epan/packet.h> +#include <wiretap/wtap.h> #include <epan/conversation.h> #include <epan/wmem/wmem.h> #include <epan/xdlc.h> diff --git a/ui/alert_box.c b/ui/alert_box.c index 72aed85061..14cd9e7679 100644 --- a/ui/alert_box.c +++ b/ui/alert_box.c @@ -29,6 +29,7 @@ #include <glib.h> +#include <wiretap/wtap.h> #include <wsutil/filesystem.h> #include <epan/dfilter/dfilter.h> diff --git a/ui/export_object.c b/ui/export_object.c index 5a07651075..bc900ef4ff 100644 --- a/ui/export_object.c +++ b/ui/export_object.c @@ -39,6 +39,7 @@ #include <errno.h> #include <epan/packet_info.h> +#include <wiretap/wtap.h> #include <epan/tap.h> #include <wsutil/file_util.h> |