From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-netmon.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'epan/dissectors/packet-netmon.h') diff --git a/epan/dissectors/packet-netmon.h b/epan/dissectors/packet-netmon.h index 59244b21..1051dda3 100644 --- a/epan/dissectors/packet-netmon.h +++ b/epan/dissectors/packet-netmon.h @@ -10,6 +10,8 @@ #ifndef PACKET_NETMON_H #define PACKET_NETMON_H +#include + #define EVENT_HEADER_FLAG_EXTENDED_INFO 0x0001 #define EVENT_HEADER_FLAG_PRIVATE_SESSION 0x0002 #define EVENT_HEADER_FLAG_STRING_ONLY 0x0004 @@ -22,18 +24,18 @@ /* Dissector data for Provider ID dissector table */ struct netmon_provider_id_data { - guint32 event_id; - guint16 event_flags; - guint8 event_version; - guint64 keyword; - guint8 opcode; + uint32_t event_id; + uint16_t event_flags; + uint8_t event_version; + uint64_t keyword; + uint8_t opcode; }; -void netmon_etl_field(proto_tree *tree, tvbuff_t *tvb, int* offset, int hf, guint16 flags); +void netmon_etl_field(proto_tree *tree, tvbuff_t *tvb, int* offset, int hf, uint16_t flags); void netmon_sid_field(proto_tree *tree, tvbuff_t *tvb, int* offset, packet_info *pinfo, int hf_revision, int hf_subauthority_count, int hf_sid_id, int hf_sid_authority, - expert_field* invalid_sid, gboolean conformant); + expert_field* invalid_sid, bool conformant); #endif /* PACKET_NETMON_H */ -- cgit v1.2.3