Don't have every dissector include wtap.h

The header for frame_data can forward declare an incomplete type
for wtap_rec, since it only takes a pointer to it.

This prevents every dissector from automatically including
wiretap/wtap.h

Add wiretap/wtap.h to some dissectors that need it.

Remove it from some other dissectors that had the explicit include
but don't actually need it.

A few other dissectors actually need wsutil/inet_addr.h but were
getting that via wtap.h - include what they actually need.

This reduces the number of files that are recompiled when
wiretap/wtap.h is touched from ~2500 to ~800.

Note that most of the dissectors that still include wiretap/wtap.h
really only need to use a WTAP_ENCAP_ value, and most of the rest
just need a pseudoheader. Those could be moved into another wiretap
include to further reduce recompilation.

Related to #19127

epan/dissectors/file-btsnoop.c

@@ -15,7 +15,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/expert.h>
-
+#include <wiretap/wtap.h>
 
 static dissector_handle_t btsnoop_handle;
 static dissector_handle_t hci_h1_handle;

epan/dissectors/file-file.c

@@ -25,10 +25,9 @@
 #include <epan/tap.h>
 #include <epan/expert.h>
 #include <epan/proto_data.h>
-
-#include <wsutil/str_util.h>
-
 #include <epan/color_filters.h>
+#include <wiretap/wtap.h>
+#include <wsutil/str_util.h>
 
 #include "file-file.h"
 

epan/dissectors/file-jpeg.c

@@ -26,7 +26,7 @@
 
 #include <epan/packet.h>
 #include <epan/expert.h>
-
+#include <wiretap/wtap.h>
 
 void proto_register_jfif(void);
 void proto_reg_handoff_jfif(void);

epan/dissectors/file-mp4.c

@@ -25,6 +25,7 @@
 #include <epan/packet.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>
+#include <wiretap/wtap.h>
 
 #define MAKE_TYPE_VAL(a, b, c, d)   ((a)<<24 | (b)<<16 | (c)<<8 | (d))
 

epan/dissectors/file-rfc7468.c

@@ -11,6 +11,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <wiretap/wtap.h>
 
 void proto_register_rfc7468(void);
 void proto_reg_handoff_rfc7468(void);

epan/dissectors/file-rtpdump.c

@@ -20,7 +20,7 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <wsutil/strtoi.h>
-
+#include <wsutil/inet_addr.h>
 
 void proto_register_rtpdump(void);
 void proto_reg_handoff_rtpdump(void);

epan/dissectors/packet-actrace.c

@@ -15,7 +15,9 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/tap.h>
+#include <wiretap/wtap.h>
 #include "packet-actrace.h"
+
 #define UDP_PORT_ACTRACE 2428 /* Not IANA registered */
 
 #define NOT_ACTRACE  0

epan/dissectors/packet-alp.c

@@ -18,6 +18,7 @@
 #include <stdbool.h>
 #include <epan/packet.h>
 #include <epan/to_str.h>
+#include <wiretap/wtap.h>
 
 void proto_reg_handoff_alp(void);
 void proto_register_alp(void);

epan/dissectors/packet-arcnet.c

@@ -13,7 +13,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <epan/address_types.h>
 #include <epan/arcnet_pids.h>
 #include <epan/to_str.h>

epan/dissectors/packet-atalk.c

@@ -27,7 +27,6 @@
 #include <epan/to_str.h>
 #include <epan/expert.h>
 #include <epan/dissectors/packet-llc.h>
-#include <wiretap/wtap.h>
 #include <epan/capture_dissectors.h>
 #include "packet-atalk.h"
 #include "packet-afp.h"

epan/dissectors/packet-ax25-kiss.c

@@ -101,7 +101,6 @@
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
 #include <epan/prefs.h>
-#include <wiretap/wtap.h>
 
 #define STRLEN	80
 

epan/dissectors/packet-ax25.c

@@ -34,7 +34,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <epan/to_str.h>
 #include <epan/xdlc.h>
 #include <epan/ax25_pids.h>

epan/dissectors/packet-btl2cap.c

@@ -24,7 +24,6 @@
 #include <epan/decode_as.h>
 #include <epan/proto_data.h>
 #include <epan/reassemble.h>
-
 #include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"

epan/dissectors/packet-btlmp.c

@@ -15,7 +15,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 #include "packet-btbredr_rf.h"

epan/dissectors/packet-dlt.c

@@ -31,6 +31,7 @@
 
 #include <epan/to_str.h>
 #include <epan/uat.h>
+#include <wiretap/wtap.h>
 
 #include <epan/dissectors/packet-dlt.h>
 

epan/dissectors/packet-docsis.c

@@ -44,7 +44,6 @@
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
 #include <epan/addr_resolv.h>
-#include <wiretap/wtap.h>
 #include <epan/exceptions.h>
 #include <epan/crc16-tvb.h>
 #include <epan/crc32-tvb.h>

epan/dissectors/packet-dpauxmon.c

@@ -10,12 +10,13 @@
  */
 
 #include <config.h>
-#include <conversation.h>
-
-#include "packet-dpaux.h"
 
 #include <epan/packet.h>
+#include <epan/conversation.h>
 #include <epan/proto_data.h>
+#include <wiretap/wtap.h>
+
+#include "packet-dpaux.h"
 
 enum {
     DPAUXMON_DATA = 0x00,

epan/dissectors/packet-erf.c

@@ -16,12 +16,14 @@
 #include <epan/ipproto.h>
 #include <epan/to_str.h>
 #include <wsutil/str_util.h>
+#include <wiretap/wtap.h>
+#include <wiretap/erf_record.h>
+
 #include "packet-erf.h"
 #include "packet-ptp.h"
 
 /*
 */
-#include "wiretap/erf_record.h"
 
 void proto_register_erf(void);
 void proto_reg_handoff_erf(void);

epan/dissectors/packet-etw.c

@@ -17,6 +17,7 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <wiretap/wtap.h>
 
 void proto_register_etw(void);
 void proto_reg_handoff_etw(void);

epan/dissectors/packet-fr.c

@@ -28,7 +28,6 @@
 #include <epan/expert.h>
 #include <epan/conversation.h>
 #include <epan/arptypes.h>
-#include <wiretap/wtap.h>
 
 #include "packet-llc.h"
 #include "packet-chdlc.h"

epan/dissectors/packet-frame.c

@@ -24,7 +24,6 @@
 #include <epan/prefs.h>
 #include <epan/to_str.h>
 #include <epan/sequence_analysis.h>
-#include <wiretap/wtap.h>
 #include <epan/tap.h>
 #include <epan/expert.h>
 #include <wsutil/wsgcrypt.h>

epan/dissectors/packet-gsmtap.c

@@ -36,6 +36,7 @@
 #include <epan/packet.h>
 #include <epan/conversation.h>
 #include <epan/dissectors/packet-gsm_rlcmac.h>
+#include <wiretap/wtap.h>
 
 #include "packet-gsmtap.h"
 #include "packet-lapdm.h"

epan/dissectors/packet-hci_usb.c

@@ -15,7 +15,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/reassemble.h>
-#include <wiretap/wtap.h>
 
 #include "packet-bluetooth.h"
 

epan/dissectors/packet-i2c.c

@@ -16,7 +16,6 @@
 #include <epan/capture_dissectors.h>
 #include <epan/prefs.h>
 #include <epan/decode_as.h>
-#include <wiretap/wtap.h>
 
 void proto_register_i2c(void);
 void proto_reg_handoff_i2c(void);

epan/dissectors/packet-ieee80211-prism.c

@@ -17,7 +17,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <wsutil/pint.h>
 #include <wsutil/802_11-utils.h>
 #include "packet-ieee80211.h"

epan/dissectors/packet-ieee80211-wlancap.c

@@ -14,7 +14,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <wsutil/pint.h>
 #include <wsutil/802_11-utils.h>
 

epan/dissectors/packet-indigocare-icall.c

@@ -13,7 +13,6 @@
 #include "config.h"
 
 #include <range.h>
-#include <wiretap/wtap.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <wsutil/strtoi.h>

epan/dissectors/packet-indigocare-netrix.c

@@ -13,7 +13,6 @@
 #include "config.h"
 
 #include <range.h>
-#include <wiretap/wtap.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <wsutil/strtoi.h>

epan/dissectors/packet-infiniband.c

@@ -21,6 +21,7 @@
 #include <epan/show_exception.h>
 #include <epan/decode_as.h>
 #include <wiretap/erf_record.h>
+#include <wiretap/wtap.h>
 
 #include "packet-infiniband.h"
 

epan/dissectors/packet-ipfc.c

@@ -16,7 +16,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <epan/to_str.h>
 
 #include "packet-llc.h"

epan/dissectors/packet-knxip_decrypt.c

@@ -14,12 +14,13 @@
 #define WS_LOG_DOMAIN "packet-knxip"
 
 #include <wsutil/file_util.h>
-#include "proto.h"
+#include <epan/proto.h>
 #include "packet-knxip_decrypt.h"
 #include <epan/wmem_scopes.h>
 #include <wsutil/wsgcrypt.h>
 #include <wsutil/strtoi.h>
 #include <wsutil/wslog.h>
+#include <wsutil/inet_addr.h>
 
 #define TEXT_BUFFER_SIZE  128
 

epan/dissectors/packet-llc.c

@@ -13,7 +13,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include <wsutil/pint.h>
 #include <epan/oui.h>
 #include <epan/xdlc.h>

epan/dissectors/packet-log3gpp.c

@@ -16,7 +16,7 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/proto_data.h>
-
+#include <wiretap/wtap.h>
 #include <wsutil/strtoi.h>
 
 #include "packet-mac-lte.h"

epan/dissectors/packet-loratap.c

@@ -15,7 +15,6 @@
  */
 
 #include "config.h"
-#include <wiretap/wtap.h>
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
 #include <epan/decode_as.h>

epan/dissectors/packet-mbim.c

@@ -42,6 +42,7 @@
 #include <epan/to_str.h>
 #include <epan/strutil.h>
 #include <epan/ipproto.h>
+#include <wiretap/wtap.h>
 
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_map.h"

epan/dissectors/packet-messageanalyzer.c

@@ -16,7 +16,6 @@
 #include <epan/expert.h>
 #include <wsutil/inet_ipv6.h>
 #include <wsutil/utf8_entities.h>
-#include <wiretap/wtap.h>
 
 #include "packet-netmon.h"
 #include "packet-windows-common.h"

epan/dissectors/packet-netflow.c

@@ -128,7 +128,6 @@
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/ipproto.h>
-#include <wiretap/wtap.h>
 #include <epan/sminmpec.h>
 #include <epan/to_str.h>
 #include <epan/expert.h>

epan/dissectors/packet-null.c

@@ -20,7 +20,6 @@
 #include "packet-ppp.h"
 #include <epan/etypes.h>
 #include <epan/aftypes.h>
-#include <wiretap/wtap.h>
 
 void proto_register_null(void);
 void proto_reg_handoff_null(void);

epan/dissectors/packet-pcap_pktdata.c

@@ -16,7 +16,6 @@
 #include <epan/packet.h>
 #include <epan/expert.h>
 
-#include <wiretap/wtap.h>
 #include <wiretap/pcap-encap.h>
 
 #include <epan/dissectors/packet-pcap_pktdata.h>

epan/dissectors/packet-raw.c

@@ -14,7 +14,6 @@
 
 #include <epan/packet.h>
 #include <epan/capture_dissectors.h>
-#include <wiretap/wtap.h>
 #include "packet-ip.h"
 #include "packet-ppp.h"
 

epan/dissectors/packet-snort.c

@@ -36,6 +36,7 @@
 #include <epan/expert.h>
 #include <wsutil/file_util.h>
 #include <wsutil/report_message.h>
+#include <wiretap/wtap.h>
 
 #include "packet-snort-config.h"
 

epan/dissectors/packet-solaredge.c

@@ -17,7 +17,6 @@
 #include <epan/prefs.h>
 #include <epan/strutil.h>
 #include <range.h>
-#include <wiretap/wtap.h>
 #include <wsutil/crc16-plain.h>
 #include <wsutil/pint.h>
 #include <wsutil/wsgcrypt.h>

epan/dissectors/packet-srt.c

@@ -23,11 +23,12 @@
  */
 
 #include <config.h>
-#include <wsutil/str_util.h>
 
 #include <epan/packet.h>
 #include <epan/expert.h>
 #include <epan/conversation.h>
+#include <wsutil/str_util.h>
+#include <wsutil/inet_addr.h>
 
 /* Prototypes */
 void proto_reg_handoff_srt(void);

epan/dissectors/packet-systemd-journal.c

@@ -29,7 +29,7 @@
 #include <epan/exceptions.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
-
+#include <wiretap/wtap.h>
 #include <wsutil/strtoi.h>
 
 #include "packet-syslog.h"

epan/dissectors/packet-tr.c

@@ -21,7 +21,6 @@
 #include "packet-llc.h"
 #include "packet-sflow.h"
 #include <epan/prefs.h>
-#include <wiretap/wtap.h>
 void proto_register_tr(void);
 void proto_reg_handoff_tr(void);
 

epan/dissectors/packet-uaudp.c

@@ -16,6 +16,7 @@
 #include <epan/prefs.h>
 #include <epan/expert.h>
 #include <wsutil/report_message.h>
+#include <wsutil/inet_addr.h>
 
 #include "packet-uaudp.h"
 

epan/dissectors/packet-uci.c

@@ -24,6 +24,7 @@
 #include <epan/conversation.h>
 #include <epan/proto_data.h>
 #include <epan/dissectors/packet-tcp.h>
+#include <wiretap/wtap.h>
 
 void proto_reg_handoff_uci(void);
 void proto_register_uci(void);

epan/dissectors/packet-usbll.c

@@ -22,6 +22,7 @@
 #include <epan/to_str.h>
 #include <epan/proto_data.h>
 #include <epan/reassemble.h>
+#include <wiretap/wtap.h>
 #include "packet-usb.h"
 
 void proto_register_usbll(void);

epan/dissectors/packet-vpp.c

@@ -20,6 +20,7 @@
 #include <epan/nlpid.h>
 #include <epan/etypes.h>
 #include <epan/ws_printf.h>
+#include <wiretap/wtap.h>
 
 void proto_register_vpp(void);
 void proto_reg_handoff_vpp(void);

epan/dissectors/packet-zbncp.c

@@ -11,10 +11,11 @@
 
 #include <config.h>
 #include <epan/packet.h>
+#include <epan/conversation.h>
+#include <wiretap/wtap.h>
 
 #include "packet-ieee802154.h"
 #include "packet-zbncp.h"
-#include "conversation.h"
 
 void proto_reg_handoff_zbncp(void);
 void proto_register_zbncp(void);

epan/frame_data.c

@@ -14,10 +14,10 @@
 #include <glib.h>
 
 #include <epan/epan.h>
-#include <wiretap/wtap.h>
 #include <epan/frame_data.h>
 #include <epan/column-utils.h>
 #include <epan/timestamp.h>
+#include <wiretap/wtap.h>
 #include <wsutil/ws_assert.h>
 
 #define COMPARE_FRAME_NUM()     ((fdata1->num < fdata2->num) ? -1 : \

epan/frame_data.h

@@ -15,12 +15,11 @@
 #include <ws_symbol_export.h>
 #include <wsutil/nstime.h>
 
-#include <wiretap/wtap.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
+typedef struct wtap_rec wtap_rec;
 struct _packet_info;
 struct epan_session;
 

wiretap/wtap.h

@@ -1378,7 +1378,7 @@ typedef struct {
  */
 #define WTAP_NSTIME_32BIT_SECS_MAX ((time_t)(sizeof(time_t) > sizeof(gint32) ? G_MAXUINT32 : G_MAXINT32))
 
-typedef struct {
+typedef struct wtap_rec {
     guint     rec_type;          /* what type of record is this? */
     guint32   presence_flags;    /* what stuff do we have? */
     guint     section_number;    /* section, within file, containing this record */