summaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mbim.h
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-mbim.h
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz
wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--epan/dissectors/packet-mbim.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-mbim.h b/epan/dissectors/packet-mbim.h
index f421b70c..5a7ad2f4 100644
--- a/epan/dissectors/packet-mbim.h
+++ b/epan/dissectors/packet-mbim.h
@@ -18,12 +18,12 @@
#define MBIM_COMMAND_SET 1
struct mbim_info {
- guint32 req_frame;
- guint32 resp_frame;
- guint32 cmd_type;
+ uint32_t req_frame;
+ uint32_t resp_frame;
+ uint32_t cmd_type;
};
-typedef void (*mbim_dissect_fct) (tvbuff_t *, packet_info *, proto_tree *, gint /* offset */, struct mbim_info *);
+typedef void (*mbim_dissect_fct) (tvbuff_t *, packet_info *, proto_tree *, int /* offset */, struct mbim_info *);
/* Structure listing the dissection function to be called for a given CID */
struct mbim_cid_dissect {
@@ -36,9 +36,9 @@ struct mbim_cid_dissect {
/* Structure handling the description of the UUID extension to be registered */
struct mbim_uuid_ext {
/* UUID value stored in network byte order */
- guint32 uuid[4];
+ uint32_t uuid[4];
/* UUID name to be displayed during dissection */
- const gchar *uuid_name;
+ const char *uuid_name;
/* value_string array containing the CID list for this UUID */
const value_string *uuid_cid_list;
/* Array of the dissection functions per CID. Pointers can be NULL when no dissection is expected */