diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-dcerpc-rpriv.c | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-dcerpc-rpriv.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-rpriv.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 808d7a85..968483a3 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -21,27 +21,27 @@ void proto_register_rpriv (void); void proto_reg_handoff_rpriv (void); -static int proto_rpriv = -1; -static int hf_rpriv_opnum = -1; -static int hf_rpriv_get_eptgt_rqst_authn_svc = -1; -static int hf_rpriv_get_eptgt_rqst_authz_svc = -1; -static int hf_rpriv_get_eptgt_rqst_var1 = -1; -/* static int hf_rpriv_get_eptgt_rqst_key_size = -1; */ -static int hf_rpriv_get_eptgt_rqst_key_size2 = -1; -static int hf_rpriv_get_eptgt_rqst_key_t = -1; -static int hf_rpriv_get_eptgt_rqst_key_t2 = -1; +static int proto_rpriv; +static int hf_rpriv_opnum; +static int hf_rpriv_get_eptgt_rqst_authn_svc; +static int hf_rpriv_get_eptgt_rqst_authz_svc; +static int hf_rpriv_get_eptgt_rqst_var1; +/* static int hf_rpriv_get_eptgt_rqst_key_size; */ +static int hf_rpriv_get_eptgt_rqst_key_size2; +static int hf_rpriv_get_eptgt_rqst_key_t; +static int hf_rpriv_get_eptgt_rqst_key_t2; -static gint ett_rpriv = -1; +static int ett_rpriv; static e_guid_t uuid_rpriv = { 0xb1e338f8, 0x9533, 0x11c9, { 0xa3, 0x4a, 0x08, 0x00, 0x1e, 0x01, 0x9c, 0x1e } }; -static guint16 ver_rpriv = 1; +static uint16_t ver_rpriv = 1; static int rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - dcerpc_info *di, guint8 *drep) + dcerpc_info *di, uint8_t *drep) { /* [in] handle_t handle, * [in] unsigned32 authn_svc, @@ -52,9 +52,9 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, * byte bytes[]; */ - guint32 authn_svc, authz_svc, key_size, key_size2, var1; - const guint8 *key_t1 = NULL; - const guint8 *key_t2 = NULL; + uint32_t authn_svc, authz_svc, key_size, key_size2, var1; + const uint8_t *key_t1 = NULL; + const uint8_t *key_t2 = NULL; offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_rpriv_get_eptgt_rqst_authn_svc, &authn_svc); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_rpriv_get_eptgt_rqst_authz_svc, &authz_svc); @@ -80,7 +80,7 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, } -static dcerpc_sub_dissector rpriv_dissectors[] = { +static const dcerpc_sub_dissector rpriv_dissectors[] = { { 0, "get_ptgt", NULL,NULL}, { 1, "become_delegate", NULL, NULL}, { 2, "become_impersonator", NULL, NULL}, @@ -113,7 +113,7 @@ proto_register_rpriv (void) }; - static gint *ett[] = { + static int *ett[] = { &ett_rpriv, }; proto_rpriv = proto_register_protocol ("Privilege Server operations", "rpriv", "rpriv"); |