From f71bb58dd553e0598f9f008f2afccb9be46f1e41 Mon Sep 17 00:00:00 2001 From: randolphcyg Date: Wed, 24 Apr 2024 15:55:01 +0800 Subject: [PATCH] [FIX]Add a global lock to the packet parsing feature to prevent c-memory errors --- go.mod | 2 +- gowireshark.go | 24 +++++++++++++++++++ include/wireshark/config.h | 2 +- include/wireshark/epan/addr_resolv.h | 2 +- include/wireshark/epan/app_mem_usage.h | 2 +- include/wireshark/epan/asn1.h | 2 +- include/wireshark/epan/capture_dissectors.h | 2 +- include/wireshark/epan/charsets.h | 2 +- include/wireshark/epan/color_filters.h | 2 +- include/wireshark/epan/column-utils.h | 2 +- include/wireshark/epan/column.h | 2 +- include/wireshark/epan/conversation.h | 2 +- include/wireshark/epan/conversation_filter.h | 2 +- include/wireshark/epan/crc10-tvb.h | 2 +- include/wireshark/epan/crc16-tvb.h | 2 +- include/wireshark/epan/crc32-tvb.h | 2 +- include/wireshark/epan/crc6-tvb.h | 2 +- .../wireshark/epan/crypt/dot11decrypt_int.h | 2 +- .../epan/crypt/dot11decrypt_system.h | 2 +- .../wireshark/epan/crypt/dot11decrypt_user.h | 2 +- .../wireshark/epan/crypt/dot11decrypt_ws.h | 2 +- include/wireshark/epan/decode_as.h | 2 +- .../wireshark/epan/dfilter/dfilter-macro.h | 2 +- include/wireshark/epan/dfilter/dfilter.h | 2 +- include/wireshark/epan/dfilter/drange.h | 2 +- include/wireshark/epan/dfilter/sttype-set.h | 2 +- include/wireshark/epan/disabled_protos.h | 2 +- .../asn1/ansi_map/packet-ansi_map-template.h | 2 +- .../asn1/camel/packet-camel-template.h | 2 +- .../asn1/gsm_map/packet-gsm_map-template.h | 2 +- .../asn1/h245/packet-h245-template.h | 2 +- .../asn1/h248/packet-h248-template.h | 2 +- .../packet-ieee1609dot2-template.h | 2 +- .../asn1/kerberos/packet-kerberos-template.h | 2 +- .../asn1/ldap/packet-ldap-template.h | 2 +- .../dissectors/asn1/t38/packet-t38-template.h | 2 +- .../asn1/tcap/packet-tcap-template.h | 2 +- include/wireshark/epan/dissectors/file-file.h | 2 +- .../wireshark/epan/dissectors/packet-a21.h | 2 +- .../wireshark/epan/dissectors/packet-amp.h | 2 +- .../epan/dissectors/packet-ansi_map.h | 2 +- .../wireshark/epan/dissectors/packet-ber.h | 2 +- .../wireshark/epan/dissectors/packet-bpsec.h | 2 +- .../wireshark/epan/dissectors/packet-bpv6.h | 2 +- .../wireshark/epan/dissectors/packet-bpv7.h | 2 +- .../wireshark/epan/dissectors/packet-bssgp.h | 2 +- .../wireshark/epan/dissectors/packet-bt-utp.h | 2 +- .../wireshark/epan/dissectors/packet-camel.h | 2 +- .../wireshark/epan/dissectors/packet-cfdp.h | 2 +- .../epan/dissectors/packet-dcerpc-nt.h | 2 +- .../wireshark/epan/dissectors/packet-dcerpc.h | 2 +- .../wireshark/epan/dissectors/packet-dcom.h | 2 +- .../wireshark/epan/dissectors/packet-dtls.h | 2 +- .../wireshark/epan/dissectors/packet-e164.h | 2 +- .../wireshark/epan/dissectors/packet-e212.h | 2 +- include/wireshark/epan/dissectors/packet-fc.h | 2 +- .../wireshark/epan/dissectors/packet-frame.h | 2 +- .../wireshark/epan/dissectors/packet-giop.h | 2 +- .../epan/dissectors/packet-gsm_a_common.h | 2 +- .../epan/dissectors/packet-gsm_map.h | 2 +- .../wireshark/epan/dissectors/packet-h245.h | 2 +- .../wireshark/epan/dissectors/packet-h248.h | 2 +- .../wireshark/epan/dissectors/packet-http.h | 2 +- .../epan/dissectors/packet-ieee1609dot2.h | 2 +- .../epan/dissectors/packet-ieee80211.h | 2 +- .../epan/dissectors/packet-ieee802a.h | 2 +- include/wireshark/epan/dissectors/packet-ip.h | 2 +- .../wireshark/epan/dissectors/packet-isup.h | 2 +- .../epan/dissectors/packet-kerberos.h | 2 +- .../wireshark/epan/dissectors/packet-ldap.h | 2 +- .../wireshark/epan/dissectors/packet-llc.h | 2 +- .../epan/dissectors/packet-mac-lte.h | 2 +- .../wireshark/epan/dissectors/packet-mbim.h | 2 +- .../wireshark/epan/dissectors/packet-mtp3.h | 2 +- .../wireshark/epan/dissectors/packet-oer.h | 2 +- .../wireshark/epan/dissectors/packet-per.h | 2 +- .../wireshark/epan/dissectors/packet-ppp.h | 2 +- .../wireshark/epan/dissectors/packet-q708.h | 2 +- .../wireshark/epan/dissectors/packet-q931.h | 2 +- .../wireshark/epan/dissectors/packet-quic.h | 2 +- .../wireshark/epan/dissectors/packet-raknet.h | 2 +- .../wireshark/epan/dissectors/packet-rpc.h | 2 +- .../wireshark/epan/dissectors/packet-rtcp.h | 2 +- .../wireshark/epan/dissectors/packet-rtp.h | 2 +- .../wireshark/epan/dissectors/packet-sccp.h | 2 +- .../epan/dissectors/packet-scsi-osd.h | 2 +- .../epan/dissectors/packet-scsi-sbc.h | 2 +- .../epan/dissectors/packet-scsi-smc.h | 2 +- .../epan/dissectors/packet-scsi-ssc.h | 2 +- .../wireshark/epan/dissectors/packet-sctp.h | 2 +- .../wireshark/epan/dissectors/packet-sll.h | 2 +- .../epan/dissectors/packet-smb-sidsnooping.h | 2 +- .../wireshark/epan/dissectors/packet-smb.h | 2 +- .../wireshark/epan/dissectors/packet-t30.h | 2 +- .../wireshark/epan/dissectors/packet-t38.h | 2 +- .../wireshark/epan/dissectors/packet-tcap.h | 2 +- .../wireshark/epan/dissectors/packet-tcp.h | 2 +- .../wireshark/epan/dissectors/packet-tcpcl.h | 2 +- .../wireshark/epan/dissectors/packet-thrift.h | 2 +- .../wireshark/epan/dissectors/packet-tls.h | 2 +- .../wireshark/epan/dissectors/packet-tpkt.h | 2 +- include/wireshark/epan/dissectors/packet-tr.h | 2 +- .../wireshark/epan/dissectors/packet-udp.h | 2 +- .../epan/dissectors/packet-windows-common.h | 2 +- .../wireshark/epan/dissectors/packet-wsp.h | 2 +- .../wireshark/epan/dissectors/packet-xml.h | 2 +- .../epan/dissectors/packet-xmpp-utils.h | 2 +- .../epan/dissectors/read_keytab_file.h | 2 +- include/wireshark/epan/dtd.h | 2 +- include/wireshark/epan/dvb_chartbl.h | 2 +- include/wireshark/epan/eap.h | 2 +- include/wireshark/epan/enterprises.h | 2 +- include/wireshark/epan/epan.h | 2 +- include/wireshark/epan/etypes.h | 2 +- include/wireshark/epan/ex-opt.h | 2 +- include/wireshark/epan/except.h | 4 ++-- include/wireshark/epan/expert.h | 2 +- include/wireshark/epan/exported_pdu.h | 4 ++-- include/wireshark/epan/fifo_string_cache.h | 2 +- include/wireshark/epan/filter_expressions.h | 2 +- include/wireshark/epan/follow.h | 2 +- include/wireshark/epan/frame_data.h | 4 ++-- include/wireshark/epan/ftypes/ftypes.h | 2 +- include/wireshark/epan/funnel.h | 2 +- include/wireshark/epan/golay.h | 2 +- include/wireshark/epan/guid-utils.h | 2 +- include/wireshark/epan/in_cksum.h | 2 +- include/wireshark/epan/introspection.h | 2 +- include/wireshark/epan/ip_opts.h | 2 +- include/wireshark/epan/ipproto.h | 2 +- include/wireshark/epan/manuf.h | 2 +- include/wireshark/epan/maxmind_db.h | 2 +- include/wireshark/epan/media_params.h | 2 +- include/wireshark/epan/next_tvb.h | 2 +- include/wireshark/epan/oids.h | 2 +- include/wireshark/epan/packet.h | 2 +- include/wireshark/epan/plugin_if.h | 4 ++-- include/wireshark/epan/prefs-int.h | 2 +- include/wireshark/epan/prefs.h | 2 +- include/wireshark/epan/print.h | 2 +- include/wireshark/epan/print_stream.h | 2 +- include/wireshark/epan/proto.h | 4 ++-- include/wireshark/epan/proto_data.h | 2 +- include/wireshark/epan/protobuf_lang_tree.h | 2 +- include/wireshark/epan/ptvcursor.h | 2 +- include/wireshark/epan/range.h | 2 +- include/wireshark/epan/reassemble.h | 2 +- include/wireshark/epan/req_resp_hdrs.h | 2 +- include/wireshark/epan/rtp_pt.h | 2 +- include/wireshark/epan/secrets.h | 2 +- include/wireshark/epan/sequence_analysis.h | 2 +- include/wireshark/epan/services.h | 2 +- include/wireshark/epan/stat_tap_ui.h | 2 +- include/wireshark/epan/stats_tree.h | 2 +- include/wireshark/epan/stats_tree_priv.h | 2 +- include/wireshark/epan/stream.h | 2 +- include/wireshark/epan/strutil.h | 2 +- include/wireshark/epan/tap.h | 2 +- include/wireshark/epan/tfs.h | 2 +- include/wireshark/epan/timestamp.h | 2 +- include/wireshark/epan/to_str.h | 2 +- include/wireshark/epan/tvbparse.h | 2 +- include/wireshark/epan/uat-int.h | 2 +- include/wireshark/epan/uat.h | 2 +- include/wireshark/epan/unit_strings.h | 2 +- include/wireshark/epan/value_string.h | 2 +- include/wireshark/epan/wscbor.h | 2 +- include/wireshark/epan/wslua/init_wslua.h | 2 +- include/wireshark/epan/wslua/wslua.h | 2 +- include/wireshark/epan/xdlc.h | 2 +- include/wireshark/include/wireshark.h | 10 ++++---- include/wireshark/sync_pipe.h | 2 +- include/wireshark/wiretap/ascend-int.h | 2 +- include/wireshark/wiretap/atm.h | 2 +- include/wireshark/wiretap/ber.h | 2 +- include/wireshark/wiretap/btsnoop.h | 2 +- include/wireshark/wiretap/capsa.h | 2 +- include/wireshark/wiretap/catapult_dct2000.h | 2 +- include/wireshark/wiretap/commview.h | 2 +- include/wireshark/wiretap/cosine.h | 2 +- include/wireshark/wiretap/csids.h | 2 +- include/wireshark/wiretap/daintree-sna.h | 2 +- include/wireshark/wiretap/dbs-etherwatch.h | 2 +- include/wireshark/wiretap/dct3trace.h | 2 +- include/wireshark/wiretap/erf.h | 2 +- include/wireshark/wiretap/eyesdn.h | 2 +- include/wireshark/wiretap/file_wrappers.h | 2 +- include/wireshark/wiretap/hcidump.h | 2 +- include/wireshark/wiretap/i4btrace.h | 2 +- include/wireshark/wiretap/introspection.h | 2 +- include/wireshark/wiretap/ipfix.h | 2 +- include/wireshark/wiretap/libpcap.h | 2 +- include/wireshark/wiretap/pcap-common.h | 2 +- include/wireshark/wiretap/pcapng.h | 2 +- include/wireshark/wiretap/peekclassic.h | 2 +- include/wireshark/wiretap/peektagged.h | 2 +- include/wireshark/wiretap/pppdump.h | 2 +- include/wireshark/wiretap/radcom.h | 2 +- include/wireshark/wiretap/snoop.h | 2 +- include/wireshark/wiretap/stanag4607.h | 2 +- include/wireshark/wiretap/systemd_journal.h | 2 +- include/wireshark/wiretap/tnef.h | 2 +- include/wireshark/wiretap/toshiba.h | 2 +- include/wireshark/wiretap/visual.h | 2 +- include/wireshark/wiretap/vms.h | 2 +- include/wireshark/wiretap/vwr.h | 2 +- include/wireshark/wiretap/wtap.h | 2 +- include/wireshark/wiretap/wtap_opttypes.h | 2 +- include/wireshark/wsutil/802_11-utils.h | 2 +- include/wireshark/wsutil/adler32.h | 2 +- include/wireshark/wsutil/base32.h | 2 +- include/wireshark/wsutil/bitswap.h | 2 +- include/wireshark/wsutil/buffer.h | 2 +- include/wireshark/wsutil/cfutils.h | 2 +- include/wireshark/wsutil/clopts_common.h | 2 +- include/wireshark/wsutil/cmdarg_err.h | 2 +- include/wireshark/wsutil/codecs.h | 4 ++-- include/wireshark/wsutil/console_win32.h | 2 +- include/wireshark/wsutil/cpu_info.h | 2 +- include/wireshark/wsutil/crash_info.h | 2 +- include/wireshark/wsutil/crc10.h | 2 +- include/wireshark/wsutil/crc11.h | 2 +- include/wireshark/wsutil/crc16-plain.h | 2 +- include/wireshark/wsutil/crc16.h | 2 +- include/wireshark/wsutil/crc32.h | 2 +- include/wireshark/wsutil/crc5.h | 2 +- include/wireshark/wsutil/crc6.h | 2 +- include/wireshark/wsutil/crc7.h | 2 +- include/wireshark/wsutil/crc8.h | 2 +- include/wireshark/wsutil/curve25519.h | 2 +- include/wireshark/wsutil/eax.h | 2 +- include/wireshark/wsutil/feature_list.h | 2 +- include/wireshark/wsutil/file_util.h | 2 +- include/wireshark/wsutil/filesystem.h | 2 +- include/wireshark/wsutil/filter_files.h | 2 +- include/wireshark/wsutil/g711.h | 2 +- include/wireshark/wsutil/glib-compat.h | 4 ++-- include/wireshark/wsutil/inet_addr.h | 2 +- include/wireshark/wsutil/interface.h | 2 +- include/wireshark/wsutil/introspection.h | 2 +- include/wireshark/wsutil/json_dumper.h | 2 +- include/wireshark/wsutil/mpeg-audio.h | 2 +- include/wireshark/wsutil/nstime.h | 2 +- include/wireshark/wsutil/os_version_info.h | 2 +- include/wireshark/wsutil/please_report_bug.h | 2 +- include/wireshark/wsutil/plugins.h | 2 +- include/wireshark/wsutil/privileges.h | 2 +- include/wireshark/wsutil/processes.h | 2 +- include/wireshark/wsutil/regex.h | 2 +- include/wireshark/wsutil/report_message.h | 2 +- include/wireshark/wsutil/rsa.h | 2 +- include/wireshark/wsutil/sober128.h | 2 +- include/wireshark/wsutil/socket.h | 2 +- include/wireshark/wsutil/str_util.h | 2 +- include/wireshark/wsutil/strnatcmp.h | 2 +- include/wireshark/wsutil/strtoi.h | 2 +- include/wireshark/wsutil/tempfile.h | 2 +- include/wireshark/wsutil/time_util.h | 2 +- include/wireshark/wsutil/to_str.h | 2 +- include/wireshark/wsutil/type_util.h | 2 +- include/wireshark/wsutil/unicode-utils.h | 2 +- include/wireshark/wsutil/win32-utils.h | 2 +- include/wireshark/wsutil/wmem/wmem_core.h | 6 ++--- include/wireshark/wsutil/wmem/wmem_strbuf.h | 2 +- include/wireshark/wsutil/ws_assert.h | 4 ++-- include/wireshark/wsutil/ws_cpuid.h | 2 +- include/wireshark/wsutil/ws_getopt.h | 2 +- include/wireshark/wsutil/ws_mempbrk.h | 2 +- include/wireshark/wsutil/ws_strptime.h | 2 +- include/wireshark/wsutil/wsgcrypt.h | 2 +- include/wireshark/wsutil/wsjson.h | 2 +- include/wireshark/wsutil/wslog.h | 8 +++---- tests/gowireshark_test.go | 20 ++++++++++++++++ 273 files changed, 332 insertions(+), 288 deletions(-) diff --git a/go.mod b/go.mod index dc331bc0..dd252331 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/randolphcyg/gowireshark -go 1.22.1 +go 1.22.2 require ( github.com/pkg/errors v0.9.1 diff --git a/gowireshark.go b/gowireshark.go index 0866f786..aa3146ea 100644 --- a/gowireshark.go +++ b/gowireshark.go @@ -18,6 +18,7 @@ import ( "log/slog" "os" "strconv" + "sync" "time" "github.com/pkg/errors" @@ -38,6 +39,8 @@ var ( // DissectResChans dissect result chan map var DissectResChans = make(map[string]chan FrameDissectRes) +var EpanMutex = &sync.Mutex{} + // Init policies、WTAP mod、EPAN mod. func init() { initEnvRes := C.init_env() @@ -91,6 +94,9 @@ func initCapFile(inputFilepath string) (err error) { // DissectPrintFirstFrame Dissect and print the first frame func DissectPrintFirstFrame(inputFilepath string) (err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return @@ -103,6 +109,9 @@ func DissectPrintFirstFrame(inputFilepath string) (err error) { // DissectPrintAllFrame Dissect and print all frames func DissectPrintAllFrame(inputFilepath string) (err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return @@ -119,6 +128,9 @@ func DissectPrintAllFrame(inputFilepath string) (err error) { // @param inputFilepath: Pcap src file path // @param count: The index of the first several frame you want to dissect func DissectPrintFirstSeveralFrame(inputFilepath string, count int) (err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return @@ -140,6 +152,9 @@ func DissectPrintFirstSeveralFrame(inputFilepath string, count int) (err error) // @param inputFilepath: Pcap src file path // @param num: The index value of the specific frame you want to dissect func DissectPrintSpecificFrame(inputFilepath string, num int) (err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return @@ -179,6 +194,9 @@ func UnmarshalHexData(src string) (res HexData, err error) { // GetSpecificFrameHexData Get hex data of specific frame func GetSpecificFrameHexData(inputFilepath string, num int) (hexData HexData, err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return @@ -688,6 +706,9 @@ func UnmarshalDissectResult(src string) (res FrameDissectRes, err error) { // @param isDebug: Whether to print JSON result in C logic // @return res: Contains specific frame's JSON dissect result func GetSpecificFrameProtoTreeInJson(inputFilepath string, num int, isDescriptive, isDebug bool) (frameDissectRes FrameDissectRes, err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return @@ -737,6 +758,9 @@ func GetSpecificFrameProtoTreeInJson(inputFilepath string, num int, isDescriptiv // @param isDebug: Whether to print JSON result in C logic // @return res: Contains all frame's JSON dissect result func GetAllFrameProtoTreeInJson(inputFilepath string, isDescriptive bool, isDebug bool) (res []FrameDissectRes, err error) { + EpanMutex.Lock() + defer EpanMutex.Unlock() + err = initCapFile(inputFilepath) if err != nil { return diff --git a/include/wireshark/config.h b/include/wireshark/config.h index 8c7f148e..7595f39f 100644 --- a/include/wireshark/config.h +++ b/include/wireshark/config.h @@ -422,6 +422,6 @@ #define HAVE_REMOTE #endif -#include +#include #endif /* __CONFIG_H__ */ diff --git a/include/wireshark/epan/addr_resolv.h b/include/wireshark/epan/addr_resolv.h index 0aff9cd2..1e5126da 100644 --- a/include/wireshark/epan/addr_resolv.h +++ b/include/wireshark/epan/addr_resolv.h @@ -25,7 +25,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/app_mem_usage.h b/include/wireshark/epan/app_mem_usage.h index 7e7b79e2..e86ae124 100644 --- a/include/wireshark/epan/app_mem_usage.h +++ b/include/wireshark/epan/app_mem_usage.h @@ -9,7 +9,7 @@ #ifndef __APP_MEM_USAGE_H__ #define __APP_MEM_USAGE_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct { const char *name; diff --git a/include/wireshark/epan/asn1.h b/include/wireshark/epan/asn1.h index 35c04a6e..12e40aa5 100644 --- a/include/wireshark/epan/asn1.h +++ b/include/wireshark/epan/asn1.h @@ -13,7 +13,7 @@ #ifndef __ASN1_H__ #define __ASN1_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef enum { ASN1_ENC_BER, /* X.690 - BER, CER, DER */ diff --git a/include/wireshark/epan/capture_dissectors.h b/include/wireshark/epan/capture_dissectors.h index 21df1798..8c1e11d8 100644 --- a/include/wireshark/epan/capture_dissectors.h +++ b/include/wireshark/epan/capture_dissectors.h @@ -11,7 +11,7 @@ #ifndef __CAPTURE_DISSECTORS_H__ #define __CAPTURE_DISSECTORS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #ifdef __cplusplus diff --git a/include/wireshark/epan/charsets.h b/include/wireshark/epan/charsets.h index 630f1e67..1e8effed 100644 --- a/include/wireshark/epan/charsets.h +++ b/include/wireshark/epan/charsets.h @@ -10,7 +10,7 @@ #ifndef __CHARSETS_H__ #define __CHARSETS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/color_filters.h b/include/wireshark/epan/color_filters.h index b66edfda..9426624e 100644 --- a/include/wireshark/epan/color_filters.h +++ b/include/wireshark/epan/color_filters.h @@ -10,7 +10,7 @@ #ifndef __COLOR_FILTERS_H__ #define __COLOR_FILTERS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include diff --git a/include/wireshark/epan/column-utils.h b/include/wireshark/epan/column-utils.h index 72395832..c39db0c2 100644 --- a/include/wireshark/epan/column-utils.h +++ b/include/wireshark/epan/column-utils.h @@ -15,7 +15,7 @@ #include #include "packet_info.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/column.h b/include/wireshark/epan/column.h index dd8d546c..d2a97a57 100644 --- a/include/wireshark/epan/column.h +++ b/include/wireshark/epan/column.h @@ -14,7 +14,7 @@ #ifndef __COLUMN_H__ #define __COLUMN_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #ifdef __cplusplus diff --git a/include/wireshark/epan/conversation.h b/include/wireshark/epan/conversation.h index 6dd8ab76..36c4cd24 100644 --- a/include/wireshark/epan/conversation.h +++ b/include/wireshark/epan/conversation.h @@ -11,7 +11,7 @@ #ifndef __CONVERSATION_H__ #define __CONVERSATION_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "packet.h" /* for conversation dissector type */ #include diff --git a/include/wireshark/epan/conversation_filter.h b/include/wireshark/epan/conversation_filter.h index 26f0f508..0c8b69d9 100644 --- a/include/wireshark/epan/conversation_filter.h +++ b/include/wireshark/epan/conversation_filter.h @@ -12,7 +12,7 @@ #ifndef __DISSECTOR_FILTERS_H__ #define __DISSECTOR_FILTERS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/crc10-tvb.h b/include/wireshark/epan/crc10-tvb.h index bf7c047a..3a7d50ee 100644 --- a/include/wireshark/epan/crc10-tvb.h +++ b/include/wireshark/epan/crc10-tvb.h @@ -11,7 +11,7 @@ #ifndef __CRC10_TVB_H__ #define __CRC10_TVB_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/crc16-tvb.h b/include/wireshark/epan/crc16-tvb.h index 2e85dd79..eec254a0 100644 --- a/include/wireshark/epan/crc16-tvb.h +++ b/include/wireshark/epan/crc16-tvb.h @@ -13,7 +13,7 @@ #ifndef __CRC16_TVB_H__ #define __CRC16_TVB_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/crc32-tvb.h b/include/wireshark/epan/crc32-tvb.h index ea67370c..39aeccbc 100644 --- a/include/wireshark/epan/crc32-tvb.h +++ b/include/wireshark/epan/crc32-tvb.h @@ -11,7 +11,7 @@ #ifndef __CRC32_TVB_H__ #define __CRC32_TVB_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/crc6-tvb.h b/include/wireshark/epan/crc6-tvb.h index 6c2c932f..acb0f66d 100644 --- a/include/wireshark/epan/crc6-tvb.h +++ b/include/wireshark/epan/crc6-tvb.h @@ -11,7 +11,7 @@ #ifndef __CRC6_TVB_H__ #define __CRC6_TVB_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/crypt/dot11decrypt_int.h b/include/wireshark/epan/crypt/dot11decrypt_int.h index 0ca8d5c4..a0103754 100644 --- a/include/wireshark/epan/crypt/dot11decrypt_int.h +++ b/include/wireshark/epan/crypt/dot11decrypt_int.h @@ -14,7 +14,7 @@ #include "dot11decrypt_system.h" -#include "ws_attributes.h" +#include "include/ws_attributes.h" #include /****************************************************************************/ diff --git a/include/wireshark/epan/crypt/dot11decrypt_system.h b/include/wireshark/epan/crypt/dot11decrypt_system.h index 19ecb297..f86758eb 100644 --- a/include/wireshark/epan/crypt/dot11decrypt_system.h +++ b/include/wireshark/epan/crypt/dot11decrypt_system.h @@ -82,7 +82,7 @@ #include #include "dot11decrypt_user.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /************************************************************************/ /* Macro definitions */ diff --git a/include/wireshark/epan/crypt/dot11decrypt_user.h b/include/wireshark/epan/crypt/dot11decrypt_user.h index defded6c..2445e0b2 100644 --- a/include/wireshark/epan/crypt/dot11decrypt_user.h +++ b/include/wireshark/epan/crypt/dot11decrypt_user.h @@ -14,7 +14,7 @@ /* */ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* */ /* */ diff --git a/include/wireshark/epan/crypt/dot11decrypt_ws.h b/include/wireshark/epan/crypt/dot11decrypt_ws.h index b22a5db1..88b9b02f 100644 --- a/include/wireshark/epan/crypt/dot11decrypt_ws.h +++ b/include/wireshark/epan/crypt/dot11decrypt_ws.h @@ -10,7 +10,7 @@ #define _DOT11DECRYPT_WS_H #include "dot11decrypt_system.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/decode_as.h b/include/wireshark/epan/decode_as.h index 2df62927..489cb3a3 100644 --- a/include/wireshark/epan/decode_as.h +++ b/include/wireshark/epan/decode_as.h @@ -11,7 +11,7 @@ #ifndef __DECODE_AS_H__ #define __DECODE_AS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "ftypes/ftypes.h" #include "packet_info.h" diff --git a/include/wireshark/epan/dfilter/dfilter-macro.h b/include/wireshark/epan/dfilter/dfilter-macro.h index 477bb40c..1be982ee 100644 --- a/include/wireshark/epan/dfilter/dfilter-macro.h +++ b/include/wireshark/epan/dfilter/dfilter-macro.h @@ -10,7 +10,7 @@ #ifndef _DFILTER_MACRO_H #define _DFILTER_MACRO_H -#include +#include #include "dfilter.h" #define DFILTER_MACRO_FILENAME "dfilter_macros" diff --git a/include/wireshark/epan/dfilter/dfilter.h b/include/wireshark/epan/dfilter/dfilter.h index 640e66e6..cb9707ab 100644 --- a/include/wireshark/epan/dfilter/dfilter.h +++ b/include/wireshark/epan/dfilter/dfilter.h @@ -10,7 +10,7 @@ #ifndef DFILTER_H #define DFILTER_H -#include +#include #include "dfilter-loc.h" #include diff --git a/include/wireshark/epan/dfilter/drange.h b/include/wireshark/epan/dfilter/drange.h index 8162afd5..74f373aa 100644 --- a/include/wireshark/epan/dfilter/drange.h +++ b/include/wireshark/epan/dfilter/drange.h @@ -13,7 +13,7 @@ #ifndef __DRANGE_H__ #define __DRANGE_H__ -#include +#include /* Please don't directly manipulate these structs. Please use * the methods provided. If you REALLY can't do what you need to diff --git a/include/wireshark/epan/dfilter/sttype-set.h b/include/wireshark/epan/dfilter/sttype-set.h index 7b2670bf..b3739d14 100644 --- a/include/wireshark/epan/dfilter/sttype-set.h +++ b/include/wireshark/epan/dfilter/sttype-set.h @@ -11,7 +11,7 @@ #ifndef STTYPE_SET_H #define STTYPE_SET_H -#include +#include #include "syntax-tree.h" diff --git a/include/wireshark/epan/disabled_protos.h b/include/wireshark/epan/disabled_protos.h index 56d1c0ad..f640143e 100644 --- a/include/wireshark/epan/disabled_protos.h +++ b/include/wireshark/epan/disabled_protos.h @@ -17,7 +17,7 @@ extern "C" { #endif /* __cplusplus */ #include -#include +#include /* * Tell if protocols have been enabled/disabled since diff --git a/include/wireshark/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.h b/include/wireshark/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.h index c164521a..7f45f1ed 100644 --- a/include/wireshark/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.h +++ b/include/wireshark/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.h @@ -12,7 +12,7 @@ #ifndef PACKET_ANSI_MAP_H #define PACKET_ANSI_MAP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define ANSI_MAP_MAX_NUM_MESSAGE_TYPES 256 diff --git a/include/wireshark/epan/dissectors/asn1/camel/packet-camel-template.h b/include/wireshark/epan/dissectors/asn1/camel/packet-camel-template.h index 4db9e099..4a274fcd 100644 --- a/include/wireshark/epan/dissectors/asn1/camel/packet-camel-template.h +++ b/include/wireshark/epan/dissectors/asn1/camel/packet-camel-template.h @@ -20,7 +20,7 @@ #ifndef PACKET_CAMEL_H #define PACKET_CAMEL_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" void proto_reg_handoff_camel(void); void proto_register_camel(void); diff --git a/include/wireshark/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.h b/include/wireshark/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.h index 0cebb20a..8b0c8cb2 100644 --- a/include/wireshark/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.h +++ b/include/wireshark/epan/dissectors/asn1/gsm_map/packet-gsm_map-template.h @@ -12,7 +12,7 @@ #ifndef PACKET_GSM_MAP_H #define PACKET_GSM_MAP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* Defines for the GSM MAP taps */ #define GSM_MAP_MAX_NUM_OPR_CODES 256 diff --git a/include/wireshark/epan/dissectors/asn1/h245/packet-h245-template.h b/include/wireshark/epan/dissectors/asn1/h245/packet-h245-template.h index 9edd1159..32cfddad 100644 --- a/include/wireshark/epan/dissectors/asn1/h245/packet-h245-template.h +++ b/include/wireshark/epan/dissectors/asn1/h245/packet-h245-template.h @@ -12,7 +12,7 @@ #ifndef PACKET_H245_H #define PACKET_H245_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef enum _h245_msg_type { H245_TermCapSet, diff --git a/include/wireshark/epan/dissectors/asn1/h248/packet-h248-template.h b/include/wireshark/epan/dissectors/asn1/h248/packet-h248-template.h index ac32c704..79a50550 100644 --- a/include/wireshark/epan/dissectors/asn1/h248/packet-h248-template.h +++ b/include/wireshark/epan/dissectors/asn1/h248/packet-h248-template.h @@ -14,7 +14,7 @@ #ifndef PACKET_H248_H #define PACKET_H248_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.h b/include/wireshark/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.h index f64075d7..f31cf459 100644 --- a/include/wireshark/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.h +++ b/include/wireshark/epan/dissectors/asn1/ieee1609dot2/packet-ieee1609dot2-template.h @@ -12,7 +12,7 @@ #ifndef _IEEE1609DOT2_H_ #define _IEEE1609DOT2_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "packet-ieee1609dot2-val.h" diff --git a/include/wireshark/epan/dissectors/asn1/kerberos/packet-kerberos-template.h b/include/wireshark/epan/dissectors/asn1/kerberos/packet-kerberos-template.h index 4f776ae9..10dba440 100644 --- a/include/wireshark/epan/dissectors/asn1/kerberos/packet-kerberos-template.h +++ b/include/wireshark/epan/dissectors/asn1/kerberos/packet-kerberos-template.h @@ -12,7 +12,7 @@ #ifndef __PACKET_KERBEROS_H #define __PACKET_KERBEROS_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/asn1/ldap/packet-ldap-template.h b/include/wireshark/epan/dissectors/asn1/ldap/packet-ldap-template.h index 0116c0cb..17531d8c 100644 --- a/include/wireshark/epan/dissectors/asn1/ldap/packet-ldap-template.h +++ b/include/wireshark/epan/dissectors/asn1/ldap/packet-ldap-template.h @@ -13,7 +13,7 @@ #define __PACKET_LDAP_H__ # include /* for dissector_*_t types */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * These are all APPLICATION types; the value is the type tag. diff --git a/include/wireshark/epan/dissectors/asn1/t38/packet-t38-template.h b/include/wireshark/epan/dissectors/asn1/t38/packet-t38-template.h index 82ff1483..70164f48 100644 --- a/include/wireshark/epan/dissectors/asn1/t38/packet-t38-template.h +++ b/include/wireshark/epan/dissectors/asn1/t38/packet-t38-template.h @@ -11,7 +11,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define MAX_T38_DATA_ITEMS 4 #define MAX_T38_DESC 128 diff --git a/include/wireshark/epan/dissectors/asn1/tcap/packet-tcap-template.h b/include/wireshark/epan/dissectors/asn1/tcap/packet-tcap-template.h index 8e3a6ccd..832abcc6 100644 --- a/include/wireshark/epan/dissectors/asn1/tcap/packet-tcap-template.h +++ b/include/wireshark/epan/dissectors/asn1/tcap/packet-tcap-template.h @@ -13,7 +13,7 @@ #ifndef PACKET_tcap_H #define PACKET_tcap_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* TCAP component type */ #define TCAP_COMP_INVOKE 0xa1 diff --git a/include/wireshark/epan/dissectors/file-file.h b/include/wireshark/epan/dissectors/file-file.h index b06ab9fa..c4cda1a1 100644 --- a/include/wireshark/epan/dissectors/file-file.h +++ b/include/wireshark/epan/dissectors/file-file.h @@ -9,7 +9,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Routine used to register file record end routine. The routine should only diff --git a/include/wireshark/epan/dissectors/packet-a21.h b/include/wireshark/epan/dissectors/packet-a21.h index 802b6505..a97d9cf9 100644 --- a/include/wireshark/epan/dissectors/packet-a21.h +++ b/include/wireshark/epan/dissectors/packet-a21.h @@ -10,7 +10,7 @@ #ifndef __PACKET_A21_H__ #define __PACKET_A21_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/packet-amp.h b/include/wireshark/epan/dissectors/packet-amp.h index eef9d5ed..e8fa10c5 100644 --- a/include/wireshark/epan/dissectors/packet-amp.h +++ b/include/wireshark/epan/dissectors/packet-amp.h @@ -12,7 +12,7 @@ #ifndef PACKET_AMP_H #define PACKET_AMP_H -#include +#include #include #include diff --git a/include/wireshark/epan/dissectors/packet-ansi_map.h b/include/wireshark/epan/dissectors/packet-ansi_map.h index ec99de46..00a74088 100644 --- a/include/wireshark/epan/dissectors/packet-ansi_map.h +++ b/include/wireshark/epan/dissectors/packet-ansi_map.h @@ -17,7 +17,7 @@ #ifndef PACKET_ANSI_MAP_H #define PACKET_ANSI_MAP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define ANSI_MAP_MAX_NUM_MESSAGE_TYPES 256 diff --git a/include/wireshark/epan/dissectors/packet-ber.h b/include/wireshark/epan/dissectors/packet-ber.h index 0d96e53d..1b60ba16 100644 --- a/include/wireshark/epan/dissectors/packet-ber.h +++ b/include/wireshark/epan/dissectors/packet-ber.h @@ -15,7 +15,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* value for value and size constraints */ #ifndef NO_BOUND diff --git a/include/wireshark/epan/dissectors/packet-bpsec.h b/include/wireshark/epan/dissectors/packet-bpsec.h index eae6c313..50c85767 100644 --- a/include/wireshark/epan/dissectors/packet-bpsec.h +++ b/include/wireshark/epan/dissectors/packet-bpsec.h @@ -14,7 +14,7 @@ #ifndef PACKET_BPSEC_H #define PACKET_BPSEC_H -#include +#include #include #include #include diff --git a/include/wireshark/epan/dissectors/packet-bpv6.h b/include/wireshark/epan/dissectors/packet-bpv6.h index 37b4d1fd..72dbff4f 100644 --- a/include/wireshark/epan/dissectors/packet-bpv6.h +++ b/include/wireshark/epan/dissectors/packet-bpv6.h @@ -21,7 +21,7 @@ #ifndef PACKET_BPV6_H #define PACKET_BPV6_H -#include +#include #include #include diff --git a/include/wireshark/epan/dissectors/packet-bpv7.h b/include/wireshark/epan/dissectors/packet-bpv7.h index 8e345567..cf1552c7 100644 --- a/include/wireshark/epan/dissectors/packet-bpv7.h +++ b/include/wireshark/epan/dissectors/packet-bpv7.h @@ -14,7 +14,7 @@ #ifndef PACKET_BPV7_H #define PACKET_BPV7_H -#include +#include #include #include #include diff --git a/include/wireshark/epan/dissectors/packet-bssgp.h b/include/wireshark/epan/dissectors/packet-bssgp.h index f672b4bf..94cd524e 100644 --- a/include/wireshark/epan/dissectors/packet-bssgp.h +++ b/include/wireshark/epan/dissectors/packet-bssgp.h @@ -13,7 +13,7 @@ #ifndef __PACKET_BSSGP_H__ #define __PACKET_BSSGP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" WS_DLL_PUBLIC value_string_ext bssgp_cause_vals_ext; diff --git a/include/wireshark/epan/dissectors/packet-bt-utp.h b/include/wireshark/epan/dissectors/packet-bt-utp.h index 4074c074..efd2188a 100644 --- a/include/wireshark/epan/dissectors/packet-bt-utp.h +++ b/include/wireshark/epan/dissectors/packet-bt-utp.h @@ -11,7 +11,7 @@ #ifndef __PACKET_BT_UTP_H__ #define __PACKET_BT_UTP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include diff --git a/include/wireshark/epan/dissectors/packet-camel.h b/include/wireshark/epan/dissectors/packet-camel.h index ab27894d..7eb73f42 100644 --- a/include/wireshark/epan/dissectors/packet-camel.h +++ b/include/wireshark/epan/dissectors/packet-camel.h @@ -25,7 +25,7 @@ #ifndef PACKET_CAMEL_H #define PACKET_CAMEL_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" void proto_reg_handoff_camel(void); void proto_register_camel(void); diff --git a/include/wireshark/epan/dissectors/packet-cfdp.h b/include/wireshark/epan/dissectors/packet-cfdp.h index ec802abb..5bbcb1d5 100644 --- a/include/wireshark/epan/dissectors/packet-cfdp.h +++ b/include/wireshark/epan/dissectors/packet-cfdp.h @@ -16,7 +16,7 @@ #ifndef PACKET_CFDP_H #define PACKET_CFDP_H -#include +#include #include #include diff --git a/include/wireshark/epan/dissectors/packet-dcerpc-nt.h b/include/wireshark/epan/dissectors/packet-dcerpc-nt.h index 8761af42..f9070949 100644 --- a/include/wireshark/epan/dissectors/packet-dcerpc-nt.h +++ b/include/wireshark/epan/dissectors/packet-dcerpc-nt.h @@ -12,7 +12,7 @@ #ifndef __PACKET_DCERPC_NT_H #define __PACKET_DCERPC_NT_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Platform ID values, used by several dissectors. diff --git a/include/wireshark/epan/dissectors/packet-dcerpc.h b/include/wireshark/epan/dissectors/packet-dcerpc.h index f1759111..74d7a7d4 100644 --- a/include/wireshark/epan/dissectors/packet-dcerpc.h +++ b/include/wireshark/epan/dissectors/packet-dcerpc.h @@ -13,7 +13,7 @@ #define __PACKET_DCERPC_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/packet-dcom.h b/include/wireshark/epan/dissectors/packet-dcom.h index f1af6dda..b9b654ee 100644 --- a/include/wireshark/epan/dissectors/packet-dcom.h +++ b/include/wireshark/epan/dissectors/packet-dcom.h @@ -11,7 +11,7 @@ #ifndef __PACKET_DCOM_H #define __PACKET_DCOM_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" WS_DLL_PUBLIC const value_string dcom_hresult_vals[]; WS_DLL_PUBLIC const value_string dcom_variant_type_vals[]; diff --git a/include/wireshark/epan/dissectors/packet-dtls.h b/include/wireshark/epan/dissectors/packet-dtls.h index 1351282b..5686d3fb 100644 --- a/include/wireshark/epan/dissectors/packet-dtls.h +++ b/include/wireshark/epan/dissectors/packet-dtls.h @@ -11,7 +11,7 @@ #ifndef __PACKET_DTLS_H__ #define __PACKET_DTLS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include WS_DLL_PUBLIC void dtls_dissector_add(guint port, dissector_handle_t handle); diff --git a/include/wireshark/epan/dissectors/packet-e164.h b/include/wireshark/epan/dissectors/packet-e164.h index 1619063f..812bef43 100644 --- a/include/wireshark/epan/dissectors/packet-e164.h +++ b/include/wireshark/epan/dissectors/packet-e164.h @@ -13,7 +13,7 @@ #define __PACKET_E164_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" extern const value_string E164_country_code_value[]; extern const value_string E164_ISO3166_country_code_short_value[]; diff --git a/include/wireshark/epan/dissectors/packet-e212.h b/include/wireshark/epan/dissectors/packet-e212.h index 104bd686..7acbbf3d 100644 --- a/include/wireshark/epan/dissectors/packet-e212.h +++ b/include/wireshark/epan/dissectors/packet-e212.h @@ -13,7 +13,7 @@ #define __PACKET_E212_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" extern value_string_ext E212_codes_ext; diff --git a/include/wireshark/epan/dissectors/packet-fc.h b/include/wireshark/epan/dissectors/packet-fc.h index 553dea24..a4f71f79 100644 --- a/include/wireshark/epan/dissectors/packet-fc.h +++ b/include/wireshark/epan/dissectors/packet-fc.h @@ -14,7 +14,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* R_CTL upper bits creates a classification tree */ #define FC_RCTL_DEV_DATA 0x00 diff --git a/include/wireshark/epan/dissectors/packet-frame.h b/include/wireshark/epan/dissectors/packet-frame.h index 70fedb52..917a4073 100644 --- a/include/wireshark/epan/dissectors/packet-frame.h +++ b/include/wireshark/epan/dissectors/packet-frame.h @@ -9,7 +9,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Routine used to register frame end routine. The routine should only diff --git a/include/wireshark/epan/dissectors/packet-giop.h b/include/wireshark/epan/dissectors/packet-giop.h index 7b07e112..8b7bf6fb 100644 --- a/include/wireshark/epan/dissectors/packet-giop.h +++ b/include/wireshark/epan/dissectors/packet-giop.h @@ -14,7 +14,7 @@ #ifndef PACKET_GIOP_H #define PACKET_GIOP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Useful visible data/structs diff --git a/include/wireshark/epan/dissectors/packet-gsm_a_common.h b/include/wireshark/epan/dissectors/packet-gsm_a_common.h index 579fe171..196491f9 100644 --- a/include/wireshark/epan/dissectors/packet-gsm_a_common.h +++ b/include/wireshark/epan/dissectors/packet-gsm_a_common.h @@ -73,7 +73,7 @@ #include "packet-sccp.h" #include "packet-e212.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* PROTOTYPES/FORWARDS */ typedef guint16 (*elem_fcn)(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guint len, gchar *add_string, int string_len); diff --git a/include/wireshark/epan/dissectors/packet-gsm_map.h b/include/wireshark/epan/dissectors/packet-gsm_map.h index eb14bc44..74c4de91 100644 --- a/include/wireshark/epan/dissectors/packet-gsm_map.h +++ b/include/wireshark/epan/dissectors/packet-gsm_map.h @@ -17,7 +17,7 @@ #ifndef PACKET_GSM_MAP_H #define PACKET_GSM_MAP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* Defines for the GSM MAP taps */ #define GSM_MAP_MAX_NUM_OPR_CODES 256 diff --git a/include/wireshark/epan/dissectors/packet-h245.h b/include/wireshark/epan/dissectors/packet-h245.h index 4f231518..16637fee 100644 --- a/include/wireshark/epan/dissectors/packet-h245.h +++ b/include/wireshark/epan/dissectors/packet-h245.h @@ -17,7 +17,7 @@ #ifndef PACKET_H245_H #define PACKET_H245_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef enum _h245_msg_type { H245_TermCapSet, diff --git a/include/wireshark/epan/dissectors/packet-h248.h b/include/wireshark/epan/dissectors/packet-h248.h index ef7d395e..5f2d49e6 100644 --- a/include/wireshark/epan/dissectors/packet-h248.h +++ b/include/wireshark/epan/dissectors/packet-h248.h @@ -19,7 +19,7 @@ #ifndef PACKET_H248_H #define PACKET_H248_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/dissectors/packet-http.h b/include/wireshark/epan/dissectors/packet-http.h index bde9b074..5e0ceee7 100644 --- a/include/wireshark/epan/dissectors/packet-http.h +++ b/include/wireshark/epan/dissectors/packet-http.h @@ -11,7 +11,7 @@ #define __PACKET_HTTP_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" WS_DLL_PUBLIC const value_string vals_http_status_code[]; diff --git a/include/wireshark/epan/dissectors/packet-ieee1609dot2.h b/include/wireshark/epan/dissectors/packet-ieee1609dot2.h index dd5a7c89..b1e88914 100644 --- a/include/wireshark/epan/dissectors/packet-ieee1609dot2.h +++ b/include/wireshark/epan/dissectors/packet-ieee1609dot2.h @@ -17,7 +17,7 @@ #ifndef _IEEE1609DOT2_H_ #define _IEEE1609DOT2_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define p2pcd8ByteLearningRequestId 1 diff --git a/include/wireshark/epan/dissectors/packet-ieee80211.h b/include/wireshark/epan/dissectors/packet-ieee80211.h index dae3f8db..b9b5f2d7 100644 --- a/include/wireshark/epan/dissectors/packet-ieee80211.h +++ b/include/wireshark/epan/dissectors/packet-ieee80211.h @@ -13,7 +13,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/packet-ieee802a.h b/include/wireshark/epan/dissectors/packet-ieee802a.h index 3eabee2c..9f85752b 100644 --- a/include/wireshark/epan/dissectors/packet-ieee802a.h +++ b/include/wireshark/epan/dissectors/packet-ieee802a.h @@ -10,7 +10,7 @@ #ifndef __PACKET_IEEE802A_H__ #define __PACKET_IEEE802A_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Add an entry for a new OUI. diff --git a/include/wireshark/epan/dissectors/packet-ip.h b/include/wireshark/epan/dissectors/packet-ip.h index dfc04a74..b63ec576 100644 --- a/include/wireshark/epan/dissectors/packet-ip.h +++ b/include/wireshark/epan/dissectors/packet-ip.h @@ -12,7 +12,7 @@ #ifndef __PACKET_IP_H__ #define __PACKET_IP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * IP Version numbers, from diff --git a/include/wireshark/epan/dissectors/packet-isup.h b/include/wireshark/epan/dissectors/packet-isup.h index aafbc017..d0084bc8 100644 --- a/include/wireshark/epan/dissectors/packet-isup.h +++ b/include/wireshark/epan/dissectors/packet-isup.h @@ -13,7 +13,7 @@ #ifndef PACKET_ISUP_H #define PACKET_ISUP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define ISUP_MAX_NUM_MESSAGE_TYPES 256 diff --git a/include/wireshark/epan/dissectors/packet-kerberos.h b/include/wireshark/epan/dissectors/packet-kerberos.h index 8ecb13a6..53619790 100644 --- a/include/wireshark/epan/dissectors/packet-kerberos.h +++ b/include/wireshark/epan/dissectors/packet-kerberos.h @@ -17,7 +17,7 @@ #ifndef __PACKET_KERBEROS_H #define __PACKET_KERBEROS_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/packet-ldap.h b/include/wireshark/epan/dissectors/packet-ldap.h index b436b888..3f2c7ef3 100644 --- a/include/wireshark/epan/dissectors/packet-ldap.h +++ b/include/wireshark/epan/dissectors/packet-ldap.h @@ -18,7 +18,7 @@ #define __PACKET_LDAP_H__ # include /* for dissector_*_t types */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * These are all APPLICATION types; the value is the type tag. diff --git a/include/wireshark/epan/dissectors/packet-llc.h b/include/wireshark/epan/dissectors/packet-llc.h index 98c65286..17bd80d3 100644 --- a/include/wireshark/epan/dissectors/packet-llc.h +++ b/include/wireshark/epan/dissectors/packet-llc.h @@ -10,7 +10,7 @@ #ifndef __PACKET_LLC_H__ #define __PACKET_LLC_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" extern const value_string sap_vals[]; diff --git a/include/wireshark/epan/dissectors/packet-mac-lte.h b/include/wireshark/epan/dissectors/packet-mac-lte.h index eadbce2f..d8195371 100644 --- a/include/wireshark/epan/dissectors/packet-mac-lte.h +++ b/include/wireshark/epan/dissectors/packet-mac-lte.h @@ -16,7 +16,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* radioType */ #define FDD_RADIO 1 diff --git a/include/wireshark/epan/dissectors/packet-mbim.h b/include/wireshark/epan/dissectors/packet-mbim.h index f421b70c..926c3cb7 100644 --- a/include/wireshark/epan/dissectors/packet-mbim.h +++ b/include/wireshark/epan/dissectors/packet-mbim.h @@ -12,7 +12,7 @@ #ifndef __PACKET_MBIM_H__ #define __PACKET_MBIM_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define MBIM_COMMAND_QUERY 0 #define MBIM_COMMAND_SET 1 diff --git a/include/wireshark/epan/dissectors/packet-mtp3.h b/include/wireshark/epan/dissectors/packet-mtp3.h index ea8494d6..3086c529 100644 --- a/include/wireshark/epan/dissectors/packet-mtp3.h +++ b/include/wireshark/epan/dissectors/packet-mtp3.h @@ -9,7 +9,7 @@ #ifndef __PACKET_MTP3_H__ #define __PACKET_MTP3_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef enum { ITU_STANDARD = 1, diff --git a/include/wireshark/epan/dissectors/packet-oer.h b/include/wireshark/epan/dissectors/packet-oer.h index fc502902..0031f1df 100644 --- a/include/wireshark/epan/dissectors/packet-oer.h +++ b/include/wireshark/epan/dissectors/packet-oer.h @@ -11,7 +11,7 @@ #ifndef __PACKET_OER_H__ #define __PACKET_OER_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef int (*oer_type_fn)(tvbuff_t*, int, asn1_ctx_t*, proto_tree*, int); diff --git a/include/wireshark/epan/dissectors/packet-per.h b/include/wireshark/epan/dissectors/packet-per.h index 9ea76ad7..17e7acc4 100644 --- a/include/wireshark/epan/dissectors/packet-per.h +++ b/include/wireshark/epan/dissectors/packet-per.h @@ -12,7 +12,7 @@ #ifndef __PACKET_PER_H__ #define __PACKET_PER_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef int (*per_type_fn)(tvbuff_t*, int, asn1_ctx_t*, proto_tree*, int); diff --git a/include/wireshark/epan/dissectors/packet-ppp.h b/include/wireshark/epan/dissectors/packet-ppp.h index 682d5229..957145f7 100644 --- a/include/wireshark/epan/dissectors/packet-ppp.h +++ b/include/wireshark/epan/dissectors/packet-ppp.h @@ -11,7 +11,7 @@ #define __PACKET_PPP_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" tvbuff_t *decode_fcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *fh_tree, int fcs_decode, int proto_offset); diff --git a/include/wireshark/epan/dissectors/packet-q708.h b/include/wireshark/epan/dissectors/packet-q708.h index b4577dac..81b1dfba 100644 --- a/include/wireshark/epan/dissectors/packet-q708.h +++ b/include/wireshark/epan/dissectors/packet-q708.h @@ -12,7 +12,7 @@ #ifndef __PACKET_Q708_H__ #define __PACKET_Q708_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" WS_DLL_PUBLIC void analyze_q708_ispc(tvbuff_t *tvb, proto_tree *tree, int offset, int length, guint16 ispc); diff --git a/include/wireshark/epan/dissectors/packet-q931.h b/include/wireshark/epan/dissectors/packet-q931.h index 3c430d17..13b65ecc 100644 --- a/include/wireshark/epan/dissectors/packet-q931.h +++ b/include/wireshark/epan/dissectors/packet-q931.h @@ -13,7 +13,7 @@ #ifndef __PACKET_Q931_H__ #define __PACKET_Q931_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" WS_DLL_PUBLIC void dissect_q931_bearer_capability_ie(tvbuff_t *, int, int, proto_tree *); diff --git a/include/wireshark/epan/dissectors/packet-quic.h b/include/wireshark/epan/dissectors/packet-quic.h index 568eb1c9..72d7a176 100644 --- a/include/wireshark/epan/dissectors/packet-quic.h +++ b/include/wireshark/epan/dissectors/packet-quic.h @@ -10,7 +10,7 @@ #ifndef __PACKET_QUIC_H__ #define __PACKET_QUIC_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/dissectors/packet-raknet.h b/include/wireshark/epan/dissectors/packet-raknet.h index 95345343..2fadcd23 100644 --- a/include/wireshark/epan/dissectors/packet-raknet.h +++ b/include/wireshark/epan/dissectors/packet-raknet.h @@ -11,7 +11,7 @@ #define __PACKET_RAKNET_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Different protocols (i.e. games) use different set of message IDs, diff --git a/include/wireshark/epan/dissectors/packet-rpc.h b/include/wireshark/epan/dissectors/packet-rpc.h index b6953945..60514c4f 100644 --- a/include/wireshark/epan/dissectors/packet-rpc.h +++ b/include/wireshark/epan/dissectors/packet-rpc.h @@ -14,7 +14,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/packet-rtcp.h b/include/wireshark/epan/dissectors/packet-rtcp.h index bdbb1de5..d00f3705 100644 --- a/include/wireshark/epan/dissectors/packet-rtcp.h +++ b/include/wireshark/epan/dissectors/packet-rtcp.h @@ -13,7 +13,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* Info to save in RTCP conversation / packet-info. Note that this structure applies to the destination end of diff --git a/include/wireshark/epan/dissectors/packet-rtp.h b/include/wireshark/epan/dissectors/packet-rtp.h index e2da3cd4..5dc50d8d 100644 --- a/include/wireshark/epan/dissectors/packet-rtp.h +++ b/include/wireshark/epan/dissectors/packet-rtp.h @@ -17,7 +17,7 @@ #define __PACKET_RTP_H__ #include "epan/packet.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "packet-btavdtp.h" #include "packet-sdp.h" diff --git a/include/wireshark/epan/dissectors/packet-sccp.h b/include/wireshark/epan/dissectors/packet-sccp.h index be84b9c2..c82bc916 100644 --- a/include/wireshark/epan/dissectors/packet-sccp.h +++ b/include/wireshark/epan/dissectors/packet-sccp.h @@ -11,7 +11,7 @@ #ifndef __PACKET_SCCP_H #define __PACKET_SCCP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define SCCP_MSG_TYPE_CR 0x01 #define SCCP_MSG_TYPE_CC 0x02 diff --git a/include/wireshark/epan/dissectors/packet-scsi-osd.h b/include/wireshark/epan/dissectors/packet-scsi-osd.h index 2ab6a014..4ef0381b 100644 --- a/include/wireshark/epan/dissectors/packet-scsi-osd.h +++ b/include/wireshark/epan/dissectors/packet-scsi-osd.h @@ -11,7 +11,7 @@ #ifndef __PACKET_SCSI_OSD_H_ #define __PACKET_SCSI_OSD_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define SCSI_OSD_OPCODE 0x7f diff --git a/include/wireshark/epan/dissectors/packet-scsi-sbc.h b/include/wireshark/epan/dissectors/packet-scsi-sbc.h index d0e53237..24f4ef0a 100644 --- a/include/wireshark/epan/dissectors/packet-scsi-sbc.h +++ b/include/wireshark/epan/dissectors/packet-scsi-sbc.h @@ -15,7 +15,7 @@ #ifndef __PACKET_SCSI_SBC_H_ #define __PACKET_SCSI_SBC_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* SBC Commands */ #define SCSI_SBC_FORMATUNIT 0x04 diff --git a/include/wireshark/epan/dissectors/packet-scsi-smc.h b/include/wireshark/epan/dissectors/packet-scsi-smc.h index 30788acb..60ecb3c9 100644 --- a/include/wireshark/epan/dissectors/packet-scsi-smc.h +++ b/include/wireshark/epan/dissectors/packet-scsi-smc.h @@ -15,7 +15,7 @@ #ifndef __PACKET_SCSI_SMC_H_ #define __PACKET_SCSI_SMC_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* SMC Commands */ #define SCSI_SMC_EXCHANGE_MEDIUM 0x40 diff --git a/include/wireshark/epan/dissectors/packet-scsi-ssc.h b/include/wireshark/epan/dissectors/packet-scsi-ssc.h index 789e5824..be60429c 100644 --- a/include/wireshark/epan/dissectors/packet-scsi-ssc.h +++ b/include/wireshark/epan/dissectors/packet-scsi-ssc.h @@ -15,7 +15,7 @@ #ifndef __PACKET_SCSI_SSC_H_ #define __PACKET_SCSI_SSC_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* SSC Commands */ #define SCSI_SSC_REWIND 0x01 diff --git a/include/wireshark/epan/dissectors/packet-sctp.h b/include/wireshark/epan/dissectors/packet-sctp.h index 161ace9a..c4deace8 100644 --- a/include/wireshark/epan/dissectors/packet-sctp.h +++ b/include/wireshark/epan/dissectors/packet-sctp.h @@ -14,7 +14,7 @@ #ifndef __PACKET_SCTP_H__ #define __PACKET_SCTP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dissectors/packet-sll.h b/include/wireshark/epan/dissectors/packet-sll.h index 88b00724..19195bc5 100644 --- a/include/wireshark/epan/dissectors/packet-sll.h +++ b/include/wireshark/epan/dissectors/packet-sll.h @@ -10,7 +10,7 @@ #ifndef __PACKET_SLL_H__ #define __PACKET_SLL_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * The LINUX_SLL_ values for "sll_protocol". diff --git a/include/wireshark/epan/dissectors/packet-smb-sidsnooping.h b/include/wireshark/epan/dissectors/packet-smb-sidsnooping.h index 8c6fa20b..190bf4a9 100644 --- a/include/wireshark/epan/dissectors/packet-smb-sidsnooping.h +++ b/include/wireshark/epan/dissectors/packet-smb-sidsnooping.h @@ -12,7 +12,7 @@ #ifndef _PACKET_SMB_SID_SNOOPING_H_ #define _PACKET_SMB_SID_SNOOPING_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* With MSVC and a libwireshark.dll, we need a * special declaration for sid_name_table. diff --git a/include/wireshark/epan/dissectors/packet-smb.h b/include/wireshark/epan/dissectors/packet-smb.h index d49b8cfa..996b91af 100644 --- a/include/wireshark/epan/dissectors/packet-smb.h +++ b/include/wireshark/epan/dissectors/packet-smb.h @@ -12,7 +12,7 @@ #ifndef __PACKET_SMB_H__ #define __PACKET_SMB_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/dissectors/packet-t30.h b/include/wireshark/epan/dissectors/packet-t30.h index 3f1f5cb6..79665670 100644 --- a/include/wireshark/epan/dissectors/packet-t30.h +++ b/include/wireshark/epan/dissectors/packet-t30.h @@ -11,7 +11,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" WS_DLL_PUBLIC value_string_ext t30_facsimile_control_field_vals_ext; WS_DLL_PUBLIC value_string_ext t30_facsimile_control_field_vals_short_ext; diff --git a/include/wireshark/epan/dissectors/packet-t38.h b/include/wireshark/epan/dissectors/packet-t38.h index f8d365c0..c76a7539 100644 --- a/include/wireshark/epan/dissectors/packet-t38.h +++ b/include/wireshark/epan/dissectors/packet-t38.h @@ -16,7 +16,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define MAX_T38_DATA_ITEMS 4 #define MAX_T38_DESC 128 diff --git a/include/wireshark/epan/dissectors/packet-tcap.h b/include/wireshark/epan/dissectors/packet-tcap.h index 6503ddc7..46f1e721 100644 --- a/include/wireshark/epan/dissectors/packet-tcap.h +++ b/include/wireshark/epan/dissectors/packet-tcap.h @@ -18,7 +18,7 @@ #ifndef PACKET_tcap_H #define PACKET_tcap_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* TCAP component type */ #define TCAP_COMP_INVOKE 0xa1 diff --git a/include/wireshark/epan/dissectors/packet-tcp.h b/include/wireshark/epan/dissectors/packet-tcp.h index 52205051..13f8fb5a 100644 --- a/include/wireshark/epan/dissectors/packet-tcp.h +++ b/include/wireshark/epan/dissectors/packet-tcp.h @@ -10,7 +10,7 @@ #ifndef __PACKET_TCP_H__ #define __PACKET_TCP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/dissectors/packet-tcpcl.h b/include/wireshark/epan/dissectors/packet-tcpcl.h index 91b8acd1..61d778eb 100644 --- a/include/wireshark/epan/dissectors/packet-tcpcl.h +++ b/include/wireshark/epan/dissectors/packet-tcpcl.h @@ -23,7 +23,7 @@ #ifndef PACKET_TCPCL_H #define PACKET_TCPCL_H -#include +#include #include #include diff --git a/include/wireshark/epan/dissectors/packet-thrift.h b/include/wireshark/epan/dissectors/packet-thrift.h index 8a47deab..320c6462 100644 --- a/include/wireshark/epan/dissectors/packet-thrift.h +++ b/include/wireshark/epan/dissectors/packet-thrift.h @@ -16,7 +16,7 @@ #define __PACKET_THRIFT_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef enum { diff --git a/include/wireshark/epan/dissectors/packet-tls.h b/include/wireshark/epan/dissectors/packet-tls.h index e92df385..b45a9cc3 100644 --- a/include/wireshark/epan/dissectors/packet-tls.h +++ b/include/wireshark/epan/dissectors/packet-tls.h @@ -11,7 +11,7 @@ #ifndef __PACKET_TLS_H__ #define __PACKET_TLS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include struct tlsinfo { diff --git a/include/wireshark/epan/dissectors/packet-tpkt.h b/include/wireshark/epan/dissectors/packet-tpkt.h index eb144b9b..101c9ed7 100644 --- a/include/wireshark/epan/dissectors/packet-tpkt.h +++ b/include/wireshark/epan/dissectors/packet-tpkt.h @@ -12,7 +12,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Check whether this could be a TPKT-encapsulated PDU. diff --git a/include/wireshark/epan/dissectors/packet-tr.h b/include/wireshark/epan/dissectors/packet-tr.h index 0e42a1f9..201e1ff0 100644 --- a/include/wireshark/epan/dissectors/packet-tr.h +++ b/include/wireshark/epan/dissectors/packet-tr.h @@ -10,7 +10,7 @@ #ifndef __PACKET_TR_H__ #define __PACKET_TR_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct _tr_hdr { guint8 ac; diff --git a/include/wireshark/epan/dissectors/packet-udp.h b/include/wireshark/epan/dissectors/packet-udp.h index 7d548843..93cb1dae 100644 --- a/include/wireshark/epan/dissectors/packet-udp.h +++ b/include/wireshark/epan/dissectors/packet-udp.h @@ -11,7 +11,7 @@ #ifndef __PACKET_UDP_H__ #define __PACKET_UDP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include diff --git a/include/wireshark/epan/dissectors/packet-windows-common.h b/include/wireshark/epan/dissectors/packet-windows-common.h index 1ab4fe5c..1996ab76 100644 --- a/include/wireshark/epan/dissectors/packet-windows-common.h +++ b/include/wireshark/epan/dissectors/packet-windows-common.h @@ -11,7 +11,7 @@ #ifndef __PACKET_WINDOWS_COMMON_H__ #define __PACKET_WINDOWS_COMMON_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "packet-dcerpc.h" /* Win32 errors. diff --git a/include/wireshark/epan/dissectors/packet-wsp.h b/include/wireshark/epan/dissectors/packet-wsp.h index 71378852..891fac68 100644 --- a/include/wireshark/epan/dissectors/packet-wsp.h +++ b/include/wireshark/epan/dissectors/packet-wsp.h @@ -17,7 +17,7 @@ #define __PACKET_WSP_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* These reason codes are used in the WTP dissector as the WTP user is * assumed to be WSP */ diff --git a/include/wireshark/epan/dissectors/packet-xml.h b/include/wireshark/epan/dissectors/packet-xml.h index e56355f2..6a85db5d 100644 --- a/include/wireshark/epan/dissectors/packet-xml.h +++ b/include/wireshark/epan/dissectors/packet-xml.h @@ -10,7 +10,7 @@ #ifndef __PACKET_XML_H__ #define __PACKET_XML_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct _xml_ns_t { /* the name of this namespace */ diff --git a/include/wireshark/epan/dissectors/packet-xmpp-utils.h b/include/wireshark/epan/dissectors/packet-xmpp-utils.h index cf54f9f5..d8cc229d 100644 --- a/include/wireshark/epan/dissectors/packet-xmpp-utils.h +++ b/include/wireshark/epan/dissectors/packet-xmpp-utils.h @@ -12,7 +12,7 @@ #ifndef XMPP_UTILS_H #define XMPP_UTILS_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "tvbuff.h" #include "dissectors/packet-xml.h" #include diff --git a/include/wireshark/epan/dissectors/read_keytab_file.h b/include/wireshark/epan/dissectors/read_keytab_file.h index ed332612..d1d61580 100644 --- a/include/wireshark/epan/dissectors/read_keytab_file.h +++ b/include/wireshark/epan/dissectors/read_keytab_file.h @@ -12,7 +12,7 @@ #ifndef __READ_KEYTAB_FILE_H #define __READ_KEYTAB_FILE_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/dtd.h b/include/wireshark/epan/dtd.h index 053d3efa..53f2bbba 100644 --- a/include/wireshark/epan/dtd.h +++ b/include/wireshark/epan/dtd.h @@ -17,7 +17,7 @@ #include #include /* exit() */ -#include "ws_attributes.h" +#include "include/ws_attributes.h" typedef struct _dtd_build_data_t { gchar* proto_name; diff --git a/include/wireshark/epan/dvb_chartbl.h b/include/wireshark/epan/dvb_chartbl.h index 18e0d48d..86ea6dcd 100644 --- a/include/wireshark/epan/dvb_chartbl.h +++ b/include/wireshark/epan/dvb_chartbl.h @@ -10,7 +10,7 @@ #ifndef __DVB_CHARTBL_H__ #define __DVB_CHARTBL_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/eap.h b/include/wireshark/epan/eap.h index deb84e53..acc5b142 100644 --- a/include/wireshark/epan/eap.h +++ b/include/wireshark/epan/eap.h @@ -12,7 +12,7 @@ #ifndef __EAP_H__ #define __EAP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "value_string.h" /* http://www.iana.org/assignments/eap-numbers */ diff --git a/include/wireshark/epan/enterprises.h b/include/wireshark/epan/enterprises.h index 938adda7..22c5eead 100644 --- a/include/wireshark/epan/enterprises.h +++ b/include/wireshark/epan/enterprises.h @@ -7,7 +7,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include +#include const char* global_enterprises_lookup(uint32_t value); diff --git a/include/wireshark/epan/epan.h b/include/wireshark/epan/epan.h index c822e805..48c94264 100644 --- a/include/wireshark/epan/epan.h +++ b/include/wireshark/epan/epan.h @@ -10,7 +10,7 @@ #ifndef __EPAN_H__ #define __EPAN_H__ -#include +#include #include #include diff --git a/include/wireshark/epan/etypes.h b/include/wireshark/epan/etypes.h index f5c1600e..05afe756 100644 --- a/include/wireshark/epan/etypes.h +++ b/include/wireshark/epan/etypes.h @@ -11,7 +11,7 @@ #ifndef __ETYPES_H__ #define __ETYPES_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include diff --git a/include/wireshark/epan/ex-opt.h b/include/wireshark/epan/ex-opt.h index 5ce64a89..1d5364d6 100644 --- a/include/wireshark/epan/ex-opt.h +++ b/include/wireshark/epan/ex-opt.h @@ -14,7 +14,7 @@ #ifndef _EX_OPT_H #define _EX_OPT_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/except.h b/include/wireshark/epan/except.h index 55ccd96a..f5b14e4d 100644 --- a/include/wireshark/epan/except.h +++ b/include/wireshark/epan/except.h @@ -35,8 +35,8 @@ #include #include #include -#include "ws_symbol_export.h" -#include "ws_attributes.h" +#include "include/ws_symbol_export.h" +#include "include/ws_attributes.h" #define XCEPT_GROUP_ANY 0 #define XCEPT_CODE_ANY 0 diff --git a/include/wireshark/epan/expert.h b/include/wireshark/epan/expert.h index c67ce5c2..1f4ae78c 100644 --- a/include/wireshark/epan/expert.h +++ b/include/wireshark/epan/expert.h @@ -17,7 +17,7 @@ #include #include #include "value_string.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/exported_pdu.h b/include/wireshark/epan/exported_pdu.h index 71352fa2..99477745 100644 --- a/include/wireshark/epan/exported_pdu.h +++ b/include/wireshark/epan/exported_pdu.h @@ -12,8 +12,8 @@ #ifndef EXPORTED_PDU_H #define EXPORTED_PDU_H -#include "ws_symbol_export.h" -#include "ws_attributes.h" +#include "include/ws_symbol_export.h" +#include "include/ws_attributes.h" #include diff --git a/include/wireshark/epan/fifo_string_cache.h b/include/wireshark/epan/fifo_string_cache.h index 9f4fd407..b6e3b871 100644 --- a/include/wireshark/epan/fifo_string_cache.h +++ b/include/wireshark/epan/fifo_string_cache.h @@ -12,7 +12,7 @@ #define __FIFO_STRING_CACHE_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/filter_expressions.h b/include/wireshark/epan/filter_expressions.h index b39b4131..b99c0735 100644 --- a/include/wireshark/epan/filter_expressions.h +++ b/include/wireshark/epan/filter_expressions.h @@ -11,7 +11,7 @@ #ifndef __FILTER_EXPRESSIONS_H__ #define __FILTER_EXPRESSIONS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/follow.h b/include/wireshark/epan/follow.h index 2cfdda7f..a675d7c2 100644 --- a/include/wireshark/epan/follow.h +++ b/include/wireshark/epan/follow.h @@ -18,7 +18,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/frame_data.h b/include/wireshark/epan/frame_data.h index 1e4fffee..08710f1c 100644 --- a/include/wireshark/epan/frame_data.h +++ b/include/wireshark/epan/frame_data.h @@ -11,8 +11,8 @@ #ifndef __FRAME_DATA_H__ #define __FRAME_DATA_H__ -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/epan/ftypes/ftypes.h b/include/wireshark/epan/ftypes/ftypes.h index c8e81b32..0ee5d0b6 100644 --- a/include/wireshark/epan/ftypes/ftypes.h +++ b/include/wireshark/epan/ftypes/ftypes.h @@ -12,7 +12,7 @@ #ifndef __FTYPES_H__ #define __FTYPES_H__ -#include +#include #include #include diff --git a/include/wireshark/epan/funnel.h b/include/wireshark/epan/funnel.h index 7b3e8d95..73f4deb1 100644 --- a/include/wireshark/epan/funnel.h +++ b/include/wireshark/epan/funnel.h @@ -13,7 +13,7 @@ #ifndef __FUNNEL_H__ #define __FUNNEL_H__ -#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/epan/golay.h b/include/wireshark/epan/golay.h index 9711f068..385835e1 100644 --- a/include/wireshark/epan/golay.h +++ b/include/wireshark/epan/golay.h @@ -18,7 +18,7 @@ #ifndef __GOLAY_H__ #define __GOLAY_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* encodes a 12-bit word to a 24-bit codeword */ diff --git a/include/wireshark/epan/guid-utils.h b/include/wireshark/epan/guid-utils.h index 87e7c85a..6418ec2c 100644 --- a/include/wireshark/epan/guid-utils.h +++ b/include/wireshark/epan/guid-utils.h @@ -12,7 +12,7 @@ #ifndef __GUID_UTILS_H__ #define __GUID_UTILS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #define GUID_LEN 16 diff --git a/include/wireshark/epan/in_cksum.h b/include/wireshark/epan/in_cksum.h index d0f6fdd6..c96330aa 100644 --- a/include/wireshark/epan/in_cksum.h +++ b/include/wireshark/epan/in_cksum.h @@ -10,7 +10,7 @@ #ifndef __IN_CKSUM_H__ #define __IN_CKSUM_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct { const guint8 *ptr; diff --git a/include/wireshark/epan/introspection.h b/include/wireshark/epan/introspection.h index 013fc133..00ad2b77 100644 --- a/include/wireshark/epan/introspection.h +++ b/include/wireshark/epan/introspection.h @@ -12,7 +12,7 @@ #define _EPAN_INTROSPECTION_H_ #include -#include +#include #include /** Returns an array of ws_enum_t elements. The array is sorted and diff --git a/include/wireshark/epan/ip_opts.h b/include/wireshark/epan/ip_opts.h index 5f623837..f0d16cba 100644 --- a/include/wireshark/epan/ip_opts.h +++ b/include/wireshark/epan/ip_opts.h @@ -12,7 +12,7 @@ #ifndef __IP_OPTS_H__ #define __IP_OPTS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /** @file */ diff --git a/include/wireshark/epan/ipproto.h b/include/wireshark/epan/ipproto.h index 5cb0c520..3d629c29 100644 --- a/include/wireshark/epan/ipproto.h +++ b/include/wireshark/epan/ipproto.h @@ -12,7 +12,7 @@ #ifndef __IPPROTO_H__ #define __IPPROTO_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include /* diff --git a/include/wireshark/epan/manuf.h b/include/wireshark/epan/manuf.h index 5f5ca1bd..1f1d705a 100644 --- a/include/wireshark/epan/manuf.h +++ b/include/wireshark/epan/manuf.h @@ -9,7 +9,7 @@ #ifndef __MANUF_H__ #define __MANUF_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/maxmind_db.h b/include/wireshark/epan/maxmind_db.h index ed488243..a3db8c13 100644 --- a/include/wireshark/epan/maxmind_db.h +++ b/include/wireshark/epan/maxmind_db.h @@ -16,7 +16,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/media_params.h b/include/wireshark/epan/media_params.h index c0681223..74785e04 100644 --- a/include/wireshark/epan/media_params.h +++ b/include/wireshark/epan/media_params.h @@ -18,7 +18,7 @@ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/next_tvb.h b/include/wireshark/epan/next_tvb.h index 35e23274..6f971637 100644 --- a/include/wireshark/epan/next_tvb.h +++ b/include/wireshark/epan/next_tvb.h @@ -18,7 +18,7 @@ #ifndef __NEXT_TVB_H__ #define __NEXT_TVB_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef enum { NTVB_HANDLE, diff --git a/include/wireshark/epan/oids.h b/include/wireshark/epan/oids.h index 04bd5ab0..a6f2a0b2 100644 --- a/include/wireshark/epan/oids.h +++ b/include/wireshark/epan/oids.h @@ -16,7 +16,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/packet.h b/include/wireshark/epan/packet.h index ecfa85a0..4693669e 100644 --- a/include/wireshark/epan/packet.h +++ b/include/wireshark/epan/packet.h @@ -10,7 +10,7 @@ #ifndef __PACKET_H__ #define __PACKET_H__ -#include +#include #include #include "proto.h" diff --git a/include/wireshark/epan/plugin_if.h b/include/wireshark/epan/plugin_if.h index aee18955..ebe1bd01 100644 --- a/include/wireshark/epan/plugin_if.h +++ b/include/wireshark/epan/plugin_if.h @@ -17,8 +17,8 @@ #ifndef EPAN_PLUGIN_IF_H #define EPAN_PLUGIN_IF_H -#include "ws_symbol_export.h" -#include "ws_attributes.h" +#include "include/ws_symbol_export.h" +#include "include/ws_attributes.h" #include #include diff --git a/include/wireshark/epan/prefs-int.h b/include/wireshark/epan/prefs-int.h index 1c07b5d2..a2e4f90f 100644 --- a/include/wireshark/epan/prefs-int.h +++ b/include/wireshark/epan/prefs-int.h @@ -13,7 +13,7 @@ #define __PREFS_INT_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #ifdef __cplusplus diff --git a/include/wireshark/epan/prefs.h b/include/wireshark/epan/prefs.h index 8addcf7f..79722531 100644 --- a/include/wireshark/epan/prefs.h +++ b/include/wireshark/epan/prefs.h @@ -18,7 +18,7 @@ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/print.h b/include/wireshark/epan/print.h index 4ea4628c..d851e6a1 100644 --- a/include/wireshark/epan/print.h +++ b/include/wireshark/epan/print.h @@ -21,7 +21,7 @@ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/print_stream.h b/include/wireshark/epan/print_stream.h index 3fafa556..91d8467b 100644 --- a/include/wireshark/epan/print_stream.h +++ b/include/wireshark/epan/print_stream.h @@ -13,7 +13,7 @@ #ifndef __PRINT_STREAM_H__ #define __PRINT_STREAM_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/proto.h b/include/wireshark/epan/proto.h index a45035d8..736361ab 100644 --- a/include/wireshark/epan/proto.h +++ b/include/wireshark/epan/proto.h @@ -37,8 +37,8 @@ #include "packet_info.h" #include "ftypes/ftypes.h" #include "register.h" -#include "ws_symbol_export.h" -#include "ws_attributes.h" +#include "include/ws_symbol_export.h" +#include "include/ws_attributes.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/proto_data.h b/include/wireshark/epan/proto_data.h index e10fda36..f6d92957 100644 --- a/include/wireshark/epan/proto_data.h +++ b/include/wireshark/epan/proto_data.h @@ -11,7 +11,7 @@ #ifndef __PROTO_DATA_H__ #define __PROTO_DATA_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/protobuf_lang_tree.h b/include/wireshark/epan/protobuf_lang_tree.h index abe2ebc1..67847dce 100644 --- a/include/wireshark/epan/protobuf_lang_tree.h +++ b/include/wireshark/epan/protobuf_lang_tree.h @@ -13,7 +13,7 @@ #ifndef __PROTOBUF_LANG_TREE_H__ #define __PROTOBUF_LANG_TREE_H__ -#include +#include #include #include diff --git a/include/wireshark/epan/ptvcursor.h b/include/wireshark/epan/ptvcursor.h index 1e6b35f8..6184fad1 100644 --- a/include/wireshark/epan/ptvcursor.h +++ b/include/wireshark/epan/ptvcursor.h @@ -15,7 +15,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define SUBTREE_UNDEFINED_LENGTH -1 diff --git a/include/wireshark/epan/range.h b/include/wireshark/epan/range.h index a679c264..4e87cf52 100644 --- a/include/wireshark/epan/range.h +++ b/include/wireshark/epan/range.h @@ -15,7 +15,7 @@ #define __RANGE_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #ifdef __cplusplus diff --git a/include/wireshark/epan/reassemble.h b/include/wireshark/epan/reassemble.h index 0b294d59..4915cd28 100644 --- a/include/wireshark/epan/reassemble.h +++ b/include/wireshark/epan/reassemble.h @@ -15,7 +15,7 @@ #ifndef REASSEMBLE_H #define REASSEMBLE_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* only in fd_head: packet is defragmented */ #define FD_DEFRAGMENTED 0x0001 diff --git a/include/wireshark/epan/req_resp_hdrs.h b/include/wireshark/epan/req_resp_hdrs.h index 71c67213..535ce6c8 100644 --- a/include/wireshark/epan/req_resp_hdrs.h +++ b/include/wireshark/epan/req_resp_hdrs.h @@ -12,7 +12,7 @@ #ifndef __REQ_RESP_HDRS_H__ #define __REQ_RESP_HDRS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include "wsutil/strtoi.h" /** diff --git a/include/wireshark/epan/rtp_pt.h b/include/wireshark/epan/rtp_pt.h index a687a097..b39dc974 100644 --- a/include/wireshark/epan/rtp_pt.h +++ b/include/wireshark/epan/rtp_pt.h @@ -12,7 +12,7 @@ #define __RTP_PT_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/secrets.h b/include/wireshark/epan/secrets.h index a2c19756..7cf53670 100644 --- a/include/wireshark/epan/secrets.h +++ b/include/wireshark/epan/secrets.h @@ -13,7 +13,7 @@ #define __SECRETS_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/sequence_analysis.h b/include/wireshark/epan/sequence_analysis.h index 59913e52..6491c81a 100644 --- a/include/wireshark/epan/sequence_analysis.h +++ b/include/wireshark/epan/sequence_analysis.h @@ -19,7 +19,7 @@ #ifndef __EPAN_SEQUENCE_ANALYSIS_H__ #define __EPAN_SEQUENCE_ANALYSIS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include diff --git a/include/wireshark/epan/services.h b/include/wireshark/epan/services.h index d2e890a8..e06b7768 100644 --- a/include/wireshark/epan/services.h +++ b/include/wireshark/epan/services.h @@ -7,7 +7,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#include +#include typedef enum { ws_tcp, diff --git a/include/wireshark/epan/stat_tap_ui.h b/include/wireshark/epan/stat_tap_ui.h index fc00d7de..a0621b06 100644 --- a/include/wireshark/epan/stat_tap_ui.h +++ b/include/wireshark/epan/stat_tap_ui.h @@ -11,7 +11,7 @@ #ifndef __STAT_TAP_UI_H__ #define __STAT_TAP_UI_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/stats_tree.h b/include/wireshark/epan/stats_tree.h index 8ae31b2b..b44bcd5f 100644 --- a/include/wireshark/epan/stats_tree.h +++ b/include/wireshark/epan/stats_tree.h @@ -16,7 +16,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/stats_tree_priv.h b/include/wireshark/epan/stats_tree_priv.h index 3137a9b7..374f7e64 100644 --- a/include/wireshark/epan/stats_tree_priv.h +++ b/include/wireshark/epan/stats_tree_priv.h @@ -13,7 +13,7 @@ #define __STATS_TREE_PRIV_H #include "stats_tree.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/stream.h b/include/wireshark/epan/stream.h index 1a7ad3e8..d3a85335 100644 --- a/include/wireshark/epan/stream.h +++ b/include/wireshark/epan/stream.h @@ -16,7 +16,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" struct _fragment_items; diff --git a/include/wireshark/epan/strutil.h b/include/wireshark/epan/strutil.h index ff463665..b57df609 100644 --- a/include/wireshark/epan/strutil.h +++ b/include/wireshark/epan/strutil.h @@ -11,7 +11,7 @@ #ifndef __STRUTIL_H__ #define __STRUTIL_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/tap.h b/include/wireshark/epan/tap.h index 1d736a9f..0eadb9c4 100644 --- a/include/wireshark/epan/tap.h +++ b/include/wireshark/epan/tap.h @@ -13,7 +13,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/tfs.h b/include/wireshark/epan/tfs.h index b5128261..167069a3 100644 --- a/include/wireshark/epan/tfs.h +++ b/include/wireshark/epan/tfs.h @@ -13,7 +13,7 @@ #define __TFS_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/timestamp.h b/include/wireshark/epan/timestamp.h index dee61da2..0ad8950b 100644 --- a/include/wireshark/epan/timestamp.h +++ b/include/wireshark/epan/timestamp.h @@ -11,7 +11,7 @@ #ifndef __TIMESTAMP_H__ #define __TIMESTAMP_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include diff --git a/include/wireshark/epan/to_str.h b/include/wireshark/epan/to_str.h index 920061bb..3f7c826d 100644 --- a/include/wireshark/epan/to_str.h +++ b/include/wireshark/epan/to_str.h @@ -18,7 +18,7 @@ #include #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/epan/tvbparse.h b/include/wireshark/epan/tvbparse.h index 2bc23fd8..46f548d9 100644 --- a/include/wireshark/epan/tvbparse.h +++ b/include/wireshark/epan/tvbparse.h @@ -53,7 +53,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct _tvbparse_elem_t tvbparse_elem_t; typedef struct _tvbparse_wanted_t tvbparse_wanted_t; diff --git a/include/wireshark/epan/uat-int.h b/include/wireshark/epan/uat-int.h index d478c18a..835fd265 100644 --- a/include/wireshark/epan/uat-int.h +++ b/include/wireshark/epan/uat-int.h @@ -17,7 +17,7 @@ #define __UAT_INT_H__ #include "uat.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/uat.h b/include/wireshark/epan/uat.h index 6736cafd..6dc747bb 100644 --- a/include/wireshark/epan/uat.h +++ b/include/wireshark/epan/uat.h @@ -17,7 +17,7 @@ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #ifdef __cplusplus diff --git a/include/wireshark/epan/unit_strings.h b/include/wireshark/epan/unit_strings.h index 2b5adaf5..b655c27c 100644 --- a/include/wireshark/epan/unit_strings.h +++ b/include/wireshark/epan/unit_strings.h @@ -11,7 +11,7 @@ #ifndef __UNIT_STRINGS_H__ #define __UNIT_STRINGS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/value_string.h b/include/wireshark/epan/value_string.h index c0ee2551..4d1802f2 100644 --- a/include/wireshark/epan/value_string.h +++ b/include/wireshark/epan/value_string.h @@ -14,7 +14,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #ifdef __cplusplus diff --git a/include/wireshark/epan/wscbor.h b/include/wireshark/epan/wscbor.h index 51d612cb..67ff1797 100644 --- a/include/wireshark/epan/wscbor.h +++ b/include/wireshark/epan/wscbor.h @@ -15,7 +15,7 @@ #ifndef __WSCBOR_H__ #define __WSCBOR_H__ -#include +#include #include #include #include diff --git a/include/wireshark/epan/wslua/init_wslua.h b/include/wireshark/epan/wslua/init_wslua.h index 5063076d..99bbf1e7 100644 --- a/include/wireshark/epan/wslua/init_wslua.h +++ b/include/wireshark/epan/wslua/init_wslua.h @@ -10,7 +10,7 @@ #ifndef __INIT_WSLUA_H__ #define __INIT_WSLUA_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/epan/wslua/wslua.h b/include/wireshark/epan/wslua/wslua.h index 0f6a146e..52a38199 100644 --- a/include/wireshark/epan/wslua/wslua.h +++ b/include/wireshark/epan/wslua/wslua.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/include/wireshark/epan/xdlc.h b/include/wireshark/epan/xdlc.h index 3e54477a..98531629 100644 --- a/include/wireshark/epan/xdlc.h +++ b/include/wireshark/epan/xdlc.h @@ -12,7 +12,7 @@ #ifndef __XDLC_H__ #define __XDLC_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /** @file * Define *DLC frame types, and routine to dissect the control field of diff --git a/include/wireshark/include/wireshark.h b/include/wireshark/include/wireshark.h index f7c19c23..8726b0ef 100644 --- a/include/wireshark/include/wireshark.h +++ b/include/wireshark/include/wireshark.h @@ -42,11 +42,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/include/wireshark/sync_pipe.h b/include/wireshark/sync_pipe.h index 4b54c622..1b9bbffe 100644 --- a/include/wireshark/sync_pipe.h +++ b/include/wireshark/sync_pipe.h @@ -18,7 +18,7 @@ #ifndef __SYNC_PIPE_H__ #define __SYNC_PIPE_H__ -#include +#include /* * Maximum length of sync pipe message data. Must be < 2^24, as the diff --git a/include/wireshark/wiretap/ascend-int.h b/include/wireshark/wiretap/ascend-int.h index 6c5760ff..b1b6d2ce 100644 --- a/include/wireshark/wiretap/ascend-int.h +++ b/include/wireshark/wiretap/ascend-int.h @@ -15,7 +15,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct { time_t inittime; diff --git a/include/wireshark/wiretap/atm.h b/include/wireshark/wiretap/atm.h index 4f560e3e..dc526acd 100644 --- a/include/wireshark/wiretap/atm.h +++ b/include/wireshark/wiretap/atm.h @@ -9,7 +9,7 @@ #ifndef __ATM_H__ #define __ATM_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * Routines to use with ATM capture file types that don't include information diff --git a/include/wireshark/wiretap/ber.h b/include/wireshark/wiretap/ber.h index 6c0c70c6..3eaf66fc 100644 --- a/include/wireshark/wiretap/ber.h +++ b/include/wireshark/wiretap/ber.h @@ -9,7 +9,7 @@ #ifndef __BER_H__ #define __BER_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val ber_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/btsnoop.h b/include/wireshark/wiretap/btsnoop.h index 3f070212..eb75fe4a 100644 --- a/include/wireshark/wiretap/btsnoop.h +++ b/include/wireshark/wiretap/btsnoop.h @@ -9,7 +9,7 @@ #ifndef __W_BTSNOOP_H__ #define __W_BTSNOOP_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val btsnoop_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/capsa.h b/include/wireshark/wiretap/capsa.h index 2ec42577..66efa1d8 100644 --- a/include/wireshark/wiretap/capsa.h +++ b/include/wireshark/wiretap/capsa.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val capsa_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/catapult_dct2000.h b/include/wireshark/wiretap/catapult_dct2000.h index 61b8ebb7..f0a3d571 100644 --- a/include/wireshark/wiretap/catapult_dct2000.h +++ b/include/wireshark/wiretap/catapult_dct2000.h @@ -10,7 +10,7 @@ #define __W_CAT_DCT2K_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val catapult_dct2000_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/commview.h b/include/wireshark/wiretap/commview.h index 59efd7c6..28228423 100644 --- a/include/wireshark/wiretap/commview.h +++ b/include/wireshark/wiretap/commview.h @@ -10,7 +10,7 @@ #ifndef __COMMVIEW_H__ #define __COMMVIEW_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val commview_ncf_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/cosine.h b/include/wireshark/wiretap/cosine.h index 6afa467a..26175f10 100644 --- a/include/wireshark/wiretap/cosine.h +++ b/include/wireshark/wiretap/cosine.h @@ -14,7 +14,7 @@ #define __W_COSINE_H__ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val cosine_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/csids.h b/include/wireshark/wiretap/csids.h index 64ea4aa6..35fcf285 100644 --- a/include/wireshark/wiretap/csids.h +++ b/include/wireshark/wiretap/csids.h @@ -11,7 +11,7 @@ #define __CSIDS_H__ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val csids_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/daintree-sna.h b/include/wireshark/wiretap/daintree-sna.h index 95567c1f..4171a30b 100644 --- a/include/wireshark/wiretap/daintree-sna.h +++ b/include/wireshark/wiretap/daintree-sna.h @@ -11,7 +11,7 @@ #define __DAINTREE_SNA_H__ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info _U_); diff --git a/include/wireshark/wiretap/dbs-etherwatch.h b/include/wireshark/wiretap/dbs-etherwatch.h index 0ea83c6e..a4e271e1 100644 --- a/include/wireshark/wiretap/dbs-etherwatch.h +++ b/include/wireshark/wiretap/dbs-etherwatch.h @@ -11,7 +11,7 @@ #define __W_DBS_ETHERWATCH_H__ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val dbs_etherwatch_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/dct3trace.h b/include/wireshark/wiretap/dct3trace.h index 297b88bf..f87c1f7c 100644 --- a/include/wireshark/wiretap/dct3trace.h +++ b/include/wireshark/wiretap/dct3trace.h @@ -10,7 +10,7 @@ #define __W_DCT3TRACE_H__ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val dct3trace_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/erf.h b/include/wireshark/wiretap/erf.h index 62e2144d..8bc2ee29 100644 --- a/include/wireshark/wiretap/erf.h +++ b/include/wireshark/wiretap/erf.h @@ -15,7 +15,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define ERF_POPULATE_SUCCESS 1 #define ERF_POPULATE_ALREADY_POPULATED 0 diff --git a/include/wireshark/wiretap/eyesdn.h b/include/wireshark/wiretap/eyesdn.h index 28dfec82..3888a31a 100644 --- a/include/wireshark/wiretap/eyesdn.h +++ b/include/wireshark/wiretap/eyesdn.h @@ -12,7 +12,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val eyesdn_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/file_wrappers.h b/include/wireshark/wiretap/file_wrappers.h index 4c644f32..809528b4 100644 --- a/include/wireshark/wiretap/file_wrappers.h +++ b/include/wireshark/wiretap/file_wrappers.h @@ -9,7 +9,7 @@ #ifndef __WTAP_FILE_WRAPPERS_H__ #define __WTAP_FILE_WRAPPERS_H__ -#include +#include #include "wtap.h" #include diff --git a/include/wireshark/wiretap/hcidump.h b/include/wireshark/wiretap/hcidump.h index b5685ed8..e4fa8f9a 100644 --- a/include/wireshark/wiretap/hcidump.h +++ b/include/wireshark/wiretap/hcidump.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val hcidump_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/i4btrace.h b/include/wireshark/wiretap/i4btrace.h index 455f0a65..d3d1bd1b 100644 --- a/include/wireshark/wiretap/i4btrace.h +++ b/include/wireshark/wiretap/i4btrace.h @@ -12,7 +12,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val i4btrace_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/introspection.h b/include/wireshark/wiretap/introspection.h index c12bbcf5..0120dd6f 100644 --- a/include/wireshark/wiretap/introspection.h +++ b/include/wireshark/wiretap/introspection.h @@ -12,7 +12,7 @@ #define _WTAP_INTROSPECTION_H_ #include -#include +#include #include /** Returns an array of ws_enum_t elements. The array is sorted and diff --git a/include/wireshark/wiretap/ipfix.h b/include/wireshark/wiretap/ipfix.h index 7f7bfe95..dd4cef6c 100644 --- a/include/wireshark/wiretap/ipfix.h +++ b/include/wireshark/wiretap/ipfix.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val ipfix_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/libpcap.h b/include/wireshark/wiretap/libpcap.h index 4042ec7c..095386b3 100644 --- a/include/wireshark/wiretap/libpcap.h +++ b/include/wireshark/wiretap/libpcap.h @@ -11,7 +11,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* Magic numbers in "libpcap" files. diff --git a/include/wireshark/wiretap/pcap-common.h b/include/wireshark/wiretap/pcap-common.h index af6c8218..b7c598d0 100644 --- a/include/wireshark/wiretap/pcap-common.h +++ b/include/wireshark/wiretap/pcap-common.h @@ -16,7 +16,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" extern guint wtap_max_snaplen_for_encap(int wtap_encap); diff --git a/include/wireshark/wiretap/pcapng.h b/include/wireshark/wiretap/pcapng.h index 3e5735d9..5f750e10 100644 --- a/include/wireshark/wiretap/pcapng.h +++ b/include/wireshark/wiretap/pcapng.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define PCAPNG_MAGIC 0x1A2B3C4D #define PCAPNG_SWAPPED_MAGIC 0x4D3C2B1A diff --git a/include/wireshark/wiretap/peekclassic.h b/include/wireshark/wiretap/peekclassic.h index 36a98226..f54e5b60 100644 --- a/include/wireshark/wiretap/peekclassic.h +++ b/include/wireshark/wiretap/peekclassic.h @@ -12,7 +12,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val peekclassic_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/peektagged.h b/include/wireshark/wiretap/peektagged.h index 04451ef1..5427c8dc 100644 --- a/include/wireshark/wiretap/peektagged.h +++ b/include/wireshark/wiretap/peektagged.h @@ -9,7 +9,7 @@ #ifndef __W_PEEKTAGGED_H__ #define __W_PEEKTAGGED_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/pppdump.h b/include/wireshark/wiretap/pppdump.h index a0a022fe..5accd4a0 100644 --- a/include/wireshark/wiretap/pppdump.h +++ b/include/wireshark/wiretap/pppdump.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val pppdump_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/radcom.h b/include/wireshark/wiretap/radcom.h index f45a5931..7b5a692f 100644 --- a/include/wireshark/wiretap/radcom.h +++ b/include/wireshark/wiretap/radcom.h @@ -12,7 +12,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val radcom_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/snoop.h b/include/wireshark/wiretap/snoop.h index 746764d9..2b36129b 100644 --- a/include/wireshark/wiretap/snoop.h +++ b/include/wireshark/wiretap/snoop.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val snoop_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/stanag4607.h b/include/wireshark/wiretap/stanag4607.h index 1d322b88..810ac614 100644 --- a/include/wireshark/wiretap/stanag4607.h +++ b/include/wireshark/wiretap/stanag4607.h @@ -11,7 +11,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val stanag4607_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/systemd_journal.h b/include/wireshark/wiretap/systemd_journal.h index 0a34c66c..dcfed065 100644 --- a/include/wireshark/wiretap/systemd_journal.h +++ b/include/wireshark/wiretap/systemd_journal.h @@ -12,7 +12,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val systemd_journal_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/tnef.h b/include/wireshark/wiretap/tnef.h index 21873d14..4d41bfd1 100644 --- a/include/wireshark/wiretap/tnef.h +++ b/include/wireshark/wiretap/tnef.h @@ -11,7 +11,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #define TNEF_SIGNATURE 0x223E9F78 diff --git a/include/wireshark/wiretap/toshiba.h b/include/wireshark/wiretap/toshiba.h index 9fe96df9..256082da 100644 --- a/include/wireshark/wiretap/toshiba.h +++ b/include/wireshark/wiretap/toshiba.h @@ -11,7 +11,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val toshiba_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/visual.h b/include/wireshark/wiretap/visual.h index c88e62f7..71727e37 100644 --- a/include/wireshark/wiretap/visual.h +++ b/include/wireshark/wiretap/visual.h @@ -16,7 +16,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val visual_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/vms.h b/include/wireshark/wiretap/vms.h index cb8c98f8..5cff7503 100644 --- a/include/wireshark/wiretap/vms.h +++ b/include/wireshark/wiretap/vms.h @@ -12,7 +12,7 @@ #include #include "wtap.h" -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val vms_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/vwr.h b/include/wireshark/wiretap/vwr.h index d2074168..0eb9124d 100644 --- a/include/wireshark/wiretap/vwr.h +++ b/include/wireshark/wiretap/vwr.h @@ -10,7 +10,7 @@ #ifndef __VWR_H__ #define __VWR_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" wtap_open_return_val vwr_open(wtap *wth, int *err, gchar **err_info); diff --git a/include/wireshark/wiretap/wtap.h b/include/wireshark/wiretap/wtap.h index 93bcca42..78c9bf00 100644 --- a/include/wireshark/wiretap/wtap.h +++ b/include/wireshark/wiretap/wtap.h @@ -9,7 +9,7 @@ #ifndef __WTAP_H__ #define __WTAP_H__ -#include +#include #include #include #include diff --git a/include/wireshark/wiretap/wtap_opttypes.h b/include/wireshark/wiretap/wtap_opttypes.h index f3d9efbd..babe2d1f 100644 --- a/include/wireshark/wiretap/wtap_opttypes.h +++ b/include/wireshark/wiretap/wtap_opttypes.h @@ -10,7 +10,7 @@ #ifndef WTAP_OPT_TYPES_H #define WTAP_OPT_TYPES_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/wsutil/802_11-utils.h b/include/wireshark/wsutil/802_11-utils.h index 887faddb..09fb861c 100644 --- a/include/wireshark/wsutil/802_11-utils.h +++ b/include/wireshark/wsutil/802_11-utils.h @@ -11,7 +11,7 @@ #ifndef __802_11_UTILS_H__ #define __802_11_UTILS_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/adler32.h b/include/wireshark/wsutil/adler32.h index 9ff7c649..58fb4fbc 100644 --- a/include/wireshark/wsutil/adler32.h +++ b/include/wireshark/wsutil/adler32.h @@ -12,7 +12,7 @@ #ifndef ADLER32_H #define ADLER32_H -#include +#include #ifdef __cplusplus extern "C"{ diff --git a/include/wireshark/wsutil/base32.h b/include/wireshark/wsutil/base32.h index ec1b244e..21fcb132 100644 --- a/include/wireshark/wsutil/base32.h +++ b/include/wireshark/wsutil/base32.h @@ -10,7 +10,7 @@ #ifndef __BASE32_H__ #define __BASE32_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/bitswap.h b/include/wireshark/wsutil/bitswap.h index 7e836609..9739576b 100644 --- a/include/wireshark/wsutil/bitswap.h +++ b/include/wireshark/wsutil/bitswap.h @@ -11,7 +11,7 @@ #ifndef __BITSWAP_H__ #define __BITSWAP_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/buffer.h b/include/wireshark/wsutil/buffer.h index 628d324c..eade6b93 100644 --- a/include/wireshark/wsutil/buffer.h +++ b/include/wireshark/wsutil/buffer.h @@ -11,7 +11,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/cfutils.h b/include/wireshark/wsutil/cfutils.h index 12cbefef..ed111e81 100644 --- a/include/wireshark/wsutil/cfutils.h +++ b/include/wireshark/wsutil/cfutils.h @@ -13,7 +13,7 @@ #ifndef __WSUTIL_CFUTILS_H__ #define __WSUTIL_CFUTILS_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/clopts_common.h b/include/wireshark/wsutil/clopts_common.h index 3f8b7f71..2e4dd417 100644 --- a/include/wireshark/wsutil/clopts_common.h +++ b/include/wireshark/wsutil/clopts_common.h @@ -12,7 +12,7 @@ #ifndef __CLOPTS_COMMON_H__ #define __CLOPTS_COMMON_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/cmdarg_err.h b/include/wireshark/wsutil/cmdarg_err.h index daa50524..6427585e 100644 --- a/include/wireshark/wsutil/cmdarg_err.h +++ b/include/wireshark/wsutil/cmdarg_err.h @@ -12,7 +12,7 @@ #ifndef __CMDARG_ERR_H__ #define __CMDARG_ERR_H__ -#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/wsutil/codecs.h b/include/wireshark/wsutil/codecs.h index be340bc7..5aeebb1a 100644 --- a/include/wireshark/wsutil/codecs.h +++ b/include/wireshark/wsutil/codecs.h @@ -11,8 +11,8 @@ #ifndef _CODECS_H_ #define _CODECS_H_ -#include "ws_symbol_export.h" -#include "ws_attributes.h" +#include "include/ws_symbol_export.h" +#include "include/ws_attributes.h" #include diff --git a/include/wireshark/wsutil/console_win32.h b/include/wireshark/wsutil/console_win32.h index b1020c1a..130fe47c 100644 --- a/include/wireshark/wsutil/console_win32.h +++ b/include/wireshark/wsutil/console_win32.h @@ -12,7 +12,7 @@ #ifndef __CONSOLE_WIN32_H__ #define __CONSOLE_WIN32_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/cpu_info.h b/include/wireshark/wsutil/cpu_info.h index e2e011a2..1cee3214 100644 --- a/include/wireshark/wsutil/cpu_info.h +++ b/include/wireshark/wsutil/cpu_info.h @@ -11,7 +11,7 @@ #ifndef __WSUTIL_CPU_INFO_H__ #define __WSUTIL_CPU_INFO_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crash_info.h b/include/wireshark/wsutil/crash_info.h index 37840067..d3807c2f 100644 --- a/include/wireshark/wsutil/crash_info.h +++ b/include/wireshark/wsutil/crash_info.h @@ -11,7 +11,7 @@ #ifndef __CRASH_INFO_H__ #define __CRASH_INFO_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc10.h b/include/wireshark/wsutil/crc10.h index 9ff5322a..1e0850ee 100644 --- a/include/wireshark/wsutil/crc10.h +++ b/include/wireshark/wsutil/crc10.h @@ -10,7 +10,7 @@ #ifndef __CRC10_H__ #define __CRC10_H__ -#include +#include /* Update the data block's CRC-10 remainder one byte at a time */ WS_DLL_PUBLIC uint16_t update_crc10_by_bytes(uint16_t crc10, const uint8_t *data_blk_ptr, int data_blk_size); diff --git a/include/wireshark/wsutil/crc11.h b/include/wireshark/wsutil/crc11.h index 3c48dd5c..c0d6af40 100644 --- a/include/wireshark/wsutil/crc11.h +++ b/include/wireshark/wsutil/crc11.h @@ -12,7 +12,7 @@ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc16-plain.h b/include/wireshark/wsutil/crc16-plain.h index 0e1eab6f..a61da747 100644 --- a/include/wireshark/wsutil/crc16-plain.h +++ b/include/wireshark/wsutil/crc16-plain.h @@ -33,7 +33,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc16.h b/include/wireshark/wsutil/crc16.h index 2c1be91d..55b085ac 100644 --- a/include/wireshark/wsutil/crc16.h +++ b/include/wireshark/wsutil/crc16.h @@ -13,7 +13,7 @@ #ifndef __CRC16_H__ #define __CRC16_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc32.h b/include/wireshark/wsutil/crc32.h index c6891730..6e5982b9 100644 --- a/include/wireshark/wsutil/crc32.h +++ b/include/wireshark/wsutil/crc32.h @@ -11,7 +11,7 @@ #ifndef __CRC32_H__ #define __CRC32_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc5.h b/include/wireshark/wsutil/crc5.h index 4f834d53..f7518596 100644 --- a/include/wireshark/wsutil/crc5.h +++ b/include/wireshark/wsutil/crc5.h @@ -13,7 +13,7 @@ #ifndef __CRC5_H__ #define __CRC5_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc6.h b/include/wireshark/wsutil/crc6.h index 3795c87e..fce61b5c 100644 --- a/include/wireshark/wsutil/crc6.h +++ b/include/wireshark/wsutil/crc6.h @@ -10,7 +10,7 @@ #ifndef __CRC6_H__ #define __CRC6_H__ -#include +#include WS_DLL_PUBLIC uint16_t crc6_0X6F(uint16_t crc6, const uint8_t *data_blk_ptr, int data_blk_size); diff --git a/include/wireshark/wsutil/crc7.h b/include/wireshark/wsutil/crc7.h index 7364d043..b484ddde 100644 --- a/include/wireshark/wsutil/crc7.h +++ b/include/wireshark/wsutil/crc7.h @@ -23,7 +23,7 @@ #ifndef __CRC7__H__ #define __CRC7__H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/crc8.h b/include/wireshark/wsutil/crc8.h index 8695640b..0ea6af90 100644 --- a/include/wireshark/wsutil/crc8.h +++ b/include/wireshark/wsutil/crc8.h @@ -13,7 +13,7 @@ #ifndef __CRC8_H__ #define __CRC8_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/curve25519.h b/include/wireshark/wsutil/curve25519.h index 1eda0200..1a515772 100644 --- a/include/wireshark/wsutil/curve25519.h +++ b/include/wireshark/wsutil/curve25519.h @@ -13,7 +13,7 @@ #ifndef __CURVE25519_H__ #define __CURVE25519_H__ -#include +#include /* * Computes Q = X25519(n, P). In other words, given the secret key n, the public diff --git a/include/wireshark/wsutil/eax.h b/include/wireshark/wsutil/eax.h index ccf4dc62..1e8a5658 100644 --- a/include/wireshark/wsutil/eax.h +++ b/include/wireshark/wsutil/eax.h @@ -12,7 +12,7 @@ #ifndef _EAX_H #define _EAX_H -#include +#include typedef struct tagMAC_T { diff --git a/include/wireshark/wsutil/feature_list.h b/include/wireshark/wsutil/feature_list.h index a9c2d8ec..2c767317 100644 --- a/include/wireshark/wsutil/feature_list.h +++ b/include/wireshark/wsutil/feature_list.h @@ -13,7 +13,7 @@ #define __WSUTIL_FEATURE_LIST_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/file_util.h b/include/wireshark/wsutil/file_util.h index 768182e8..2951911f 100644 --- a/include/wireshark/wsutil/file_util.h +++ b/include/wireshark/wsutil/file_util.h @@ -13,7 +13,7 @@ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef _WIN32 #include /* for _read(), _write(), etc. */ diff --git a/include/wireshark/wsutil/filesystem.h b/include/wireshark/wsutil/filesystem.h index fd3e3ebc..e5cbeacc 100644 --- a/include/wireshark/wsutil/filesystem.h +++ b/include/wireshark/wsutil/filesystem.h @@ -11,7 +11,7 @@ #ifndef FILESYSTEM_H #define FILESYSTEM_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/filter_files.h b/include/wireshark/wsutil/filter_files.h index f3e67872..b673455c 100644 --- a/include/wireshark/wsutil/filter_files.h +++ b/include/wireshark/wsutil/filter_files.h @@ -12,7 +12,7 @@ #ifndef __FILTER_FILES_H__ #define __FILTER_FILES_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/g711.h b/include/wireshark/wsutil/g711.h index d5196da8..78c2e3b8 100644 --- a/include/wireshark/wsutil/g711.h +++ b/include/wireshark/wsutil/g711.h @@ -12,7 +12,7 @@ #ifndef __G711_H__ #define __G711_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/glib-compat.h b/include/wireshark/wsutil/glib-compat.h index 08c87009..8becefe2 100644 --- a/include/wireshark/wsutil/glib-compat.h +++ b/include/wireshark/wsutil/glib-compat.h @@ -12,8 +12,8 @@ #ifndef GLIB_COMPAT_H #define GLIB_COMPAT_H -#include "ws_symbol_export.h" -#include "ws_attributes.h" +#include "include/ws_symbol_export.h" +#include "include/ws_attributes.h" #include #include diff --git a/include/wireshark/wsutil/inet_addr.h b/include/wireshark/wsutil/inet_addr.h index 7147c2ae..76cfbf46 100644 --- a/include/wireshark/wsutil/inet_addr.h +++ b/include/wireshark/wsutil/inet_addr.h @@ -10,7 +10,7 @@ #ifndef __WS_INET_ADDR_H__ #define __WS_INET_ADDR_H__ -#include +#include #include "inet_ipv4.h" #include "inet_ipv6.h" diff --git a/include/wireshark/wsutil/interface.h b/include/wireshark/wsutil/interface.h index 5c431bfa..711fd622 100644 --- a/include/wireshark/wsutil/interface.h +++ b/include/wireshark/wsutil/interface.h @@ -14,7 +14,7 @@ #define _INTERFACE_H #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* Return a list of IPv4/IPv6 addresses for local interfaces */ WS_DLL_PUBLIC diff --git a/include/wireshark/wsutil/introspection.h b/include/wireshark/wsutil/introspection.h index f3272df8..70c8e4d8 100644 --- a/include/wireshark/wsutil/introspection.h +++ b/include/wireshark/wsutil/introspection.h @@ -12,7 +12,7 @@ #define _INTROSPECTION_H_ #include -#include +#include typedef struct { const char *symbol; diff --git a/include/wireshark/wsutil/json_dumper.h b/include/wireshark/wsutil/json_dumper.h index 184960ae..133c26ec 100644 --- a/include/wireshark/wsutil/json_dumper.h +++ b/include/wireshark/wsutil/json_dumper.h @@ -13,7 +13,7 @@ #ifndef __JSON_DUMPER_H__ #define __JSON_DUMPER_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/wsutil/mpeg-audio.h b/include/wireshark/wsutil/mpeg-audio.h index 10ef36a4..bebf534f 100644 --- a/include/wireshark/wsutil/mpeg-audio.h +++ b/include/wireshark/wsutil/mpeg-audio.h @@ -12,7 +12,7 @@ #define MPA_H 1 #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" struct mpa { unsigned int emphasis :2; diff --git a/include/wireshark/wsutil/nstime.h b/include/wireshark/wsutil/nstime.h index acc78b53..12a27581 100644 --- a/include/wireshark/wsutil/nstime.h +++ b/include/wireshark/wsutil/nstime.h @@ -11,7 +11,7 @@ #ifndef __NSTIME_H__ #define __NSTIME_H__ -#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/wsutil/os_version_info.h b/include/wireshark/wsutil/os_version_info.h index f496b303..e0608597 100644 --- a/include/wireshark/wsutil/os_version_info.h +++ b/include/wireshark/wsutil/os_version_info.h @@ -11,7 +11,7 @@ #ifndef __WSUTIL_OS_VERSION_INFO_H__ #define __WSUTIL_OS_VERSION_INFO_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/please_report_bug.h b/include/wireshark/wsutil/please_report_bug.h index e99b26ca..8e1f556b 100644 --- a/include/wireshark/wsutil/please_report_bug.h +++ b/include/wireshark/wsutil/please_report_bug.h @@ -12,7 +12,7 @@ #ifndef __PLEASE_REPORT_BUG_H__ #define __PLEASE_REPORT_BUG_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/plugins.h b/include/wireshark/wsutil/plugins.h index 96f3ac03..f4e5f56b 100644 --- a/include/wireshark/wsutil/plugins.h +++ b/include/wireshark/wsutil/plugins.h @@ -11,7 +11,7 @@ #ifndef __PLUGINS_H__ #define __PLUGINS_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/privileges.h b/include/wireshark/wsutil/privileges.h index c936228c..e8eccd9a 100644 --- a/include/wireshark/wsutil/privileges.h +++ b/include/wireshark/wsutil/privileges.h @@ -11,7 +11,7 @@ #ifndef __PRIVILEGES_H__ #define __PRIVILEGES_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/processes.h b/include/wireshark/wsutil/processes.h index 8e08a171..7db41ad3 100644 --- a/include/wireshark/wsutil/processes.h +++ b/include/wireshark/wsutil/processes.h @@ -12,7 +12,7 @@ #ifndef _WSUTIL_PROCESSES_H_ #define _WSUTIL_PROCESSES_H_ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef _WIN32 /* diff --git a/include/wireshark/wsutil/regex.h b/include/wireshark/wsutil/regex.h index 0484eab3..63e7d82d 100644 --- a/include/wireshark/wsutil/regex.h +++ b/include/wireshark/wsutil/regex.h @@ -10,7 +10,7 @@ #ifndef __WSUTIL_REGEX_H__ #define __WSUTIL_REGEX_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/report_message.h b/include/wireshark/wsutil/report_message.h index 7be1808b..5f9b8158 100644 --- a/include/wireshark/wsutil/report_message.h +++ b/include/wireshark/wsutil/report_message.h @@ -20,7 +20,7 @@ #ifndef __REPORT_MESSAGE_H__ #define __REPORT_MESSAGE_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/rsa.h b/include/wireshark/wsutil/rsa.h index 83817048..a87c98cf 100644 --- a/include/wireshark/wsutil/rsa.h +++ b/include/wireshark/wsutil/rsa.h @@ -12,7 +12,7 @@ #ifndef __RSA_H__ #define __RSA_H__ -#include +#include #include #ifdef HAVE_LIBGNUTLS diff --git a/include/wireshark/wsutil/sober128.h b/include/wireshark/wsutil/sober128.h index 0238f0ef..a784004d 100644 --- a/include/wireshark/wsutil/sober128.h +++ b/include/wireshark/wsutil/sober128.h @@ -24,7 +24,7 @@ #ifndef _SOBER127_H #define _SOBER127_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" typedef struct _sober128_prng { unsigned long R[17], /* Working storage for the shift register */ diff --git a/include/wireshark/wsutil/socket.h b/include/wireshark/wsutil/socket.h index 7393db13..933092ea 100644 --- a/include/wireshark/wsutil/socket.h +++ b/include/wireshark/wsutil/socket.h @@ -12,7 +12,7 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#include +#include #if defined(_WIN32) && !defined(__CYGWIN__) #include diff --git a/include/wireshark/wsutil/str_util.h b/include/wireshark/wsutil/str_util.h index 7f1362f4..4b7f8dcd 100644 --- a/include/wireshark/wsutil/str_util.h +++ b/include/wireshark/wsutil/str_util.h @@ -11,7 +11,7 @@ #ifndef __STR_UTIL_H__ #define __STR_UTIL_H__ -#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/wsutil/strnatcmp.h b/include/wireshark/wsutil/strnatcmp.h index 0ebe1f6f..de1e556d 100644 --- a/include/wireshark/wsutil/strnatcmp.h +++ b/include/wireshark/wsutil/strnatcmp.h @@ -11,7 +11,7 @@ #ifndef STRNATCMP_H #define STRNATCMP_H -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/strtoi.h b/include/wireshark/wsutil/strtoi.h index 04fe802e..d2805b9f 100644 --- a/include/wireshark/wsutil/strtoi.h +++ b/include/wireshark/wsutil/strtoi.h @@ -16,7 +16,7 @@ #include #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/tempfile.h b/include/wireshark/wsutil/tempfile.h index 328324f0..19ce7f0f 100644 --- a/include/wireshark/wsutil/tempfile.h +++ b/include/wireshark/wsutil/tempfile.h @@ -11,7 +11,7 @@ #ifndef __TEMPFILE_H__ #define __TEMPFILE_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/time_util.h b/include/wireshark/wsutil/time_util.h index 6c2f52bf..935005ee 100644 --- a/include/wireshark/wsutil/time_util.h +++ b/include/wireshark/wsutil/time_util.h @@ -10,7 +10,7 @@ #ifndef __TIME_UTIL_H__ #define __TIME_UTIL_H__ -#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/wsutil/to_str.h b/include/wireshark/wsutil/to_str.h index 08bd536b..2031c7d4 100644 --- a/include/wireshark/wsutil/to_str.h +++ b/include/wireshark/wsutil/to_str.h @@ -12,7 +12,7 @@ #ifndef __WSUTIL_TO_STR_H__ #define __WSUTIL_TO_STR_H__ -#include +#include #include #include diff --git a/include/wireshark/wsutil/type_util.h b/include/wireshark/wsutil/type_util.h index eab9ff9b..7304ce61 100644 --- a/include/wireshark/wsutil/type_util.h +++ b/include/wireshark/wsutil/type_util.h @@ -12,7 +12,7 @@ #define __TYPE_UTIL_H__ #include -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" /* * uint64_t to double conversions taken from gstutils.h of GStreamer project diff --git a/include/wireshark/wsutil/unicode-utils.h b/include/wireshark/wsutil/unicode-utils.h index 21c50ec0..83e6c51e 100644 --- a/include/wireshark/wsutil/unicode-utils.h +++ b/include/wireshark/wsutil/unicode-utils.h @@ -11,7 +11,7 @@ #ifndef __UNICODEUTIL_H__ #define __UNICODEUTIL_H__ -#include +#include #ifdef _WIN32 #include diff --git a/include/wireshark/wsutil/win32-utils.h b/include/wireshark/wsutil/win32-utils.h index 44471c59..aa0fa4cd 100644 --- a/include/wireshark/wsutil/win32-utils.h +++ b/include/wireshark/wsutil/win32-utils.h @@ -11,7 +11,7 @@ #ifndef __WIN32UTIL_H__ #define __WIN32UTIL_H__ -#include +#include #include diff --git a/include/wireshark/wsutil/wmem/wmem_core.h b/include/wireshark/wsutil/wmem/wmem_core.h index 2f423133..c48491bf 100644 --- a/include/wireshark/wsutil/wmem/wmem_core.h +++ b/include/wireshark/wsutil/wmem/wmem_core.h @@ -16,9 +16,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/wmem/wmem_strbuf.h b/include/wireshark/wsutil/wmem/wmem_strbuf.h index 9c00b6e4..4788e546 100644 --- a/include/wireshark/wsutil/wmem/wmem_strbuf.h +++ b/include/wireshark/wsutil/wmem/wmem_strbuf.h @@ -12,7 +12,7 @@ #ifndef __WMEM_STRBUF_H__ #define __WMEM_STRBUF_H__ -#include +#include #include "wmem_core.h" diff --git a/include/wireshark/wsutil/ws_assert.h b/include/wireshark/wsutil/ws_assert.h index f4880fd8..e9ffd5ea 100644 --- a/include/wireshark/wsutil/ws_assert.h +++ b/include/wireshark/wsutil/ws_assert.h @@ -10,8 +10,8 @@ #ifndef __WS_ASSERT_H__ #define __WS_ASSERT_H__ -#include -#include +#include +#include #include #include #include diff --git a/include/wireshark/wsutil/ws_cpuid.h b/include/wireshark/wsutil/ws_cpuid.h index cc17e2a5..07c23634 100644 --- a/include/wireshark/wsutil/ws_cpuid.h +++ b/include/wireshark/wsutil/ws_cpuid.h @@ -30,7 +30,7 @@ * resulting values of EAX, EBX, ECX, and EDX are store, in order. */ -#include "ws_attributes.h" +#include "include/ws_attributes.h" #include #include diff --git a/include/wireshark/wsutil/ws_getopt.h b/include/wireshark/wsutil/ws_getopt.h index b32badce..48e07908 100644 --- a/include/wireshark/wsutil/ws_getopt.h +++ b/include/wireshark/wsutil/ws_getopt.h @@ -29,7 +29,7 @@ #ifndef _WS_GETOPT_H_ #define _WS_GETOPT_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/wireshark/wsutil/ws_mempbrk.h b/include/wireshark/wsutil/ws_mempbrk.h index 7aff505f..4e457328 100644 --- a/include/wireshark/wsutil/ws_mempbrk.h +++ b/include/wireshark/wsutil/ws_mempbrk.h @@ -10,7 +10,7 @@ #ifndef __WS_MEMPBRK_H__ #define __WS_MEMPBRK_H__ -#include +#include #ifdef HAVE_SSE4_2 #include diff --git a/include/wireshark/wsutil/ws_strptime.h b/include/wireshark/wsutil/ws_strptime.h index 0eb0c56a..05bb06aa 100644 --- a/include/wireshark/wsutil/ws_strptime.h +++ b/include/wireshark/wsutil/ws_strptime.h @@ -10,7 +10,7 @@ #ifndef __WS_STRPTIME_H__ #define __WS_STRPTIME_H__ -#include +#include #include #ifdef __cplusplus diff --git a/include/wireshark/wsutil/wsgcrypt.h b/include/wireshark/wsutil/wsgcrypt.h index 0f09f3cd..3e9ee30c 100644 --- a/include/wireshark/wsutil/wsgcrypt.h +++ b/include/wireshark/wsutil/wsgcrypt.h @@ -15,7 +15,7 @@ #ifndef __WSGCRYPT_H__ #define __WSGCRYPT_H__ -#include +#include #include #define HASH_MD5_LENGTH 16 diff --git a/include/wireshark/wsutil/wsjson.h b/include/wireshark/wsutil/wsjson.h index be232767..4e893511 100644 --- a/include/wireshark/wsutil/wsjson.h +++ b/include/wireshark/wsutil/wsjson.h @@ -14,7 +14,7 @@ #ifndef __WSJSON_H__ #define __WSJSON_H__ -#include "ws_symbol_export.h" +#include "include/ws_symbol_export.h" #include #include diff --git a/include/wireshark/wsutil/wslog.h b/include/wireshark/wsutil/wslog.h index 8044ad10..92891a10 100644 --- a/include/wireshark/wsutil/wslog.h +++ b/include/wireshark/wsutil/wslog.h @@ -19,10 +19,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef WS_LOG_DOMAIN #define _LOG_DOMAIN WS_LOG_DOMAIN diff --git a/tests/gowireshark_test.go b/tests/gowireshark_test.go index 10af816c..0f508b97 100644 --- a/tests/gowireshark_test.go +++ b/tests/gowireshark_test.go @@ -1,6 +1,7 @@ package tests import ( + "sync" "testing" "time" @@ -178,6 +179,25 @@ func TestGetAllFrameProtoTreeInJson(t *testing.T) { } } +func TestGoroutineGetAllFrameProtoTreeInJson(t *testing.T) { + var wg sync.WaitGroup + numGoroutines := 100 + + for i := 0; i < numGoroutines; i++ { + wg.Add(1) + go func(i int) { + defer wg.Done() + res, err := gowireshark.GetAllFrameProtoTreeInJson(inputFilepath, true, false) + if err != nil { + t.Error(err) + } + t.Log(i, inputFilepath, " >>>> ", len(res)) + }(i) + } + + wg.Wait() +} + /* Get interface device list, TODO but not return addresses of device (cause c logic error) */