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/pidl/frstrans/frstrans.cnf | 2 +- epan/dissectors/pidl/frstrans/frstrans.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/pidl/frstrans') diff --git a/epan/dissectors/pidl/frstrans/frstrans.cnf b/epan/dissectors/pidl/frstrans/frstrans.cnf index a1613776..dccbe3aa 100644 --- a/epan/dissectors/pidl/frstrans/frstrans.cnf +++ b/epan/dissectors/pidl/frstrans/frstrans.cnf @@ -5,7 +5,7 @@ TYPE hyper "offset=cnf_dissect_hyper(tvb, offset, pinfo, tree, di, drep, @PARAM@ CODE START static int -cnf_dissect_hyper(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, guint8 *drep, guint32 param _U_, int hfindex) +cnf_dissect_hyper(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, dcerpc_info* di, uint8_t *drep, uint32_t param _U_, int hfindex) { offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, di, drep, hfindex, NULL); diff --git a/epan/dissectors/pidl/frstrans/frstrans.idl b/epan/dissectors/pidl/frstrans/frstrans.idl index 761c3eec..ec4fd4a8 100644 --- a/epan/dissectors/pidl/frstrans/frstrans.idl +++ b/epan/dissectors/pidl/frstrans/frstrans.idl @@ -105,7 +105,7 @@ interface frstrans /*****************/ /* Function 0x04 */ typedef enum { - FRSTRANS_VERSION_REQUEST_NORNAL_SYNC = 0x0000, + FRSTRANS_VERSION_REQUEST_NORMAL_SYNC = 0x0000, FRSTRANS_VERSION_REQUEST_SLOW_SYNC = 0x0001, FRSTRANS_VERSION_REQUEST_SLAVE_SYNC = 0x0002 } frstrans_VersionRequestType; -- cgit v1.2.3