diff options
36 files changed, 1318 insertions, 1318 deletions
diff --git a/packet-dcerpc-atsvc.c b/packet-dcerpc-atsvc.c index e8477d72be..b239224c28 100644 --- a/packet-dcerpc-atsvc.c +++ b/packet-dcerpc-atsvc.c @@ -2,7 +2,7 @@ * Routines for SMB \pipe\atsvc packet disassembly * Copyright 2003 Jean-Baptiste Marchand <jbm@hsc.fr> * - * $Id: packet-dcerpc-atsvc.c,v 1.4 2003/08/04 02:49:04 tpot Exp $ + * $Id: packet-dcerpc-atsvc.c,v 1.5 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -94,7 +94,7 @@ static guint16 ver_dcerpc_atsvc = 1; static int atsvc_dissect_AT_INFO_fields(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { proto_item *item = NULL; proto_tree *flags_tree = NULL; @@ -222,7 +222,7 @@ atsvc_dissect_AT_INFO_fields(tvbuff_t *tvb, int offset, static int atsvc_dissect_AT_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { proto_item *item = NULL; proto_tree *subtree = NULL; @@ -249,7 +249,7 @@ atsvc_dissect_AT_INFO(tvbuff_t *tvb, int offset, static int atsvc_dissect_add_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_atsvc_server, 0); @@ -261,7 +261,7 @@ atsvc_dissect_add_rqst(tvbuff_t *tvb, int offset, static int atsvc_dissect_add_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_atsvc_job_id, NULL); @@ -283,7 +283,7 @@ atsvc_dissect_add_reply(tvbuff_t *tvb, int offset, static int atsvc_dissect_del_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_atsvc_server, 0); @@ -299,7 +299,7 @@ atsvc_dissect_del_rqst(tvbuff_t *tvb, int offset, static int atsvc_dissect_del_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_atsvc_rc, NULL); @@ -320,7 +320,7 @@ atsvc_dissect_del_reply(tvbuff_t *tvb, int offset, static int atsvc_dissect_AT_ENUM(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { proto_item *item = NULL; proto_tree *subtree = NULL; @@ -346,7 +346,7 @@ atsvc_dissect_AT_ENUM(tvbuff_t *tvb, int offset, static int atsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_atsvc_enum_handle, 0); @@ -357,7 +357,7 @@ atsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, static int atsvc_dissect_AT_ENUM_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, atsvc_dissect_AT_ENUM); @@ -375,7 +375,7 @@ atsvc_dissect_AT_ENUM_array(tvbuff_t *tvb, int offset, static int atsvc_dissect_AT_ENUM_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_atsvc_num_entries, NULL); @@ -400,7 +400,7 @@ atsvc_dissect_AT_ENUM_CONTAINER(tvbuff_t *tvb, int offset, static int atsvc_dissect_enum_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_atsvc_server, 0); @@ -421,7 +421,7 @@ atsvc_dissect_enum_rqst(tvbuff_t *tvb, int offset, static int atsvc_dissect_enum_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, atsvc_dissect_AT_ENUM_CONTAINER, @@ -451,7 +451,7 @@ atsvc_dissect_enum_reply(tvbuff_t *tvb, int offset, static int atsvc_dissect_getinfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_atsvc_server, 0); @@ -464,7 +464,7 @@ atsvc_dissect_getinfo_rqst(tvbuff_t *tvb, int offset, static int atsvc_dissect_getinfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, atsvc_dissect_AT_INFO, NDR_POINTER_UNIQUE, diff --git a/packet-dcerpc-browser.c b/packet-dcerpc-browser.c index 00bc119c13..8fee1bdd99 100644 --- a/packet-dcerpc-browser.c +++ b/packet-dcerpc-browser.c @@ -2,7 +2,7 @@ * Routines for DCERPC Browser packet disassembly * Copyright 2001, Ronnie Sahlberg * - * $Id: packet-dcerpc-browser.c,v 1.13 2003/10/02 21:48:35 guy Exp $ + * $Id: packet-dcerpc-browser.c,v 1.14 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -53,7 +53,7 @@ static gint ett_dcerpc_browser = -1; static int dissect_browser_long_pointer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -90,7 +90,7 @@ static guint16 ver_dcerpc_browser = 0; static int dissect_browser_TYPE_4_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -114,7 +114,7 @@ dissect_browser_TYPE_4_data(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_4(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -136,7 +136,7 @@ dissect_browser_TYPE_4(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_3_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -161,7 +161,7 @@ dissect_browser_TYPE_3_data(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -184,7 +184,7 @@ dissect_browser_TYPE_3(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -220,7 +220,7 @@ dissect_browser_TYPE_2(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -248,7 +248,7 @@ dissect_browser_TYPE_1(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_server_enum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -285,7 +285,7 @@ dissect_browser_browserr_server_enum_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_server_enum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_1, NDR_POINTER_REF, @@ -314,7 +314,7 @@ dissect_browser_browserr_server_enum_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_debug_call_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -331,7 +331,7 @@ dissect_browser_browserr_debug_call_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_debug_call_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_rc, NULL); @@ -350,7 +350,7 @@ dissect_browser_browserr_debug_call_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_other_domains_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -365,7 +365,7 @@ dissect_browser_browserr_query_other_domains_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_other_domains_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -385,7 +385,7 @@ dissect_browser_browserr_query_other_domains_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_reset_netlogon_state_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -396,7 +396,7 @@ dissect_browser_browserr_reset_netlogon_state_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_reset_netlogon_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_rc, NULL); @@ -414,7 +414,7 @@ dissect_browser_browserr_reset_netlogon_state_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_debug_trace_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -429,7 +429,7 @@ dissect_browser_browserr_debug_trace_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_debug_trace_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_rc, NULL); @@ -469,7 +469,7 @@ dissect_browser_browserr_debug_trace_reply(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_browser_unknown_hyper, NULL); @@ -541,7 +541,7 @@ dissect_browser_TYPE_5(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_statistics_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -552,7 +552,7 @@ dissect_browser_browserr_query_statistics_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_statistics_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_5, NDR_POINTER_UNIQUE, @@ -573,7 +573,7 @@ dissect_browser_browserr_query_statistics_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_reset_statistics_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -584,7 +584,7 @@ dissect_browser_browserr_reset_statistics_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_reset_statistics_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_rc, NULL); @@ -601,7 +601,7 @@ dissect_browser_browserr_reset_statistics_reply(tvbuff_t *tvb, int offset, static int dissect_browser_netr_browser_statistics_clear_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -612,7 +612,7 @@ dissect_browser_netr_browser_statistics_clear_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_netr_browser_statistics_clear_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_rc, NULL); @@ -644,7 +644,7 @@ dissect_browser_netr_browser_statistics_clear_reply(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_11(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_browser_unknown_hyper, NULL); @@ -706,7 +706,7 @@ dissect_browser_TYPE_11(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_11_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_11); @@ -717,7 +717,7 @@ dissect_browser_TYPE_11_array(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_10(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -739,7 +739,7 @@ dissect_browser_TYPE_10(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_9_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -765,7 +765,7 @@ dissect_browser_TYPE_9_data(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_9(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -787,7 +787,7 @@ dissect_browser_TYPE_9(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_8(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -823,7 +823,7 @@ dissect_browser_TYPE_8(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_7(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -844,7 +844,7 @@ dissect_browser_TYPE_7(tvbuff_t *tvb, int offset, static int dissect_browser_netr_browser_statistics_get_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -862,7 +862,7 @@ dissect_browser_netr_browser_statistics_get_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_netr_browser_statistics_get_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_7, NDR_POINTER_REF, @@ -886,7 +886,7 @@ dissect_browser_netr_browser_statistics_get_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_set_netlogon_state_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -908,7 +908,7 @@ dissect_browser_browserr_set_netlogon_state_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_set_netlogon_state_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_rc, NULL); @@ -928,7 +928,7 @@ dissect_browser_browserr_set_netlogon_state_reply(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_12_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -954,7 +954,7 @@ dissect_browser_TYPE_12_data(tvbuff_t *tvb, int offset, static int dissect_browser_TYPE_12(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_browser_unknown_long, NULL); @@ -976,7 +976,7 @@ dissect_browser_TYPE_12(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_emulated_domains_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -991,7 +991,7 @@ dissect_browser_browserr_query_emulated_domains_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_query_emulated_domains_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_12, NDR_POINTER_REF, @@ -1020,7 +1020,7 @@ dissect_browser_browserr_query_emulated_domains_reply(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_server_enum_ex_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -1057,7 +1057,7 @@ dissect_browser_browserr_server_enum_ex_rqst(tvbuff_t *tvb, int offset, static int dissect_browser_browserr_server_enum_ex_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_browser_TYPE_1, NDR_POINTER_REF, diff --git a/packet-dcerpc-conv.c b/packet-dcerpc-conv.c index 3a2cb64086..de55f7146d 100644 --- a/packet-dcerpc-conv.c +++ b/packet-dcerpc-conv.c @@ -2,7 +2,7 @@ * Routines for dcerpc conv dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-conv.c,v 1.8 2003/08/04 02:49:03 tpot Exp $ + * $Id: packet-dcerpc-conv.c,v 1.9 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -61,7 +61,7 @@ static guint16 ver_conv = 3; static int conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* * [in] uuid_t *actuid, @@ -85,7 +85,7 @@ conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset, static int conv_dissect_who_are_you_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* * [out] unsigned32 *seq, @@ -110,7 +110,7 @@ conv_dissect_who_are_you_resp (tvbuff_t *tvb, int offset, static int conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* * [in] uuid_t *actuid, @@ -133,7 +133,7 @@ conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset, static int conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* * [out] unsigned32 *seq, diff --git a/packet-dcerpc-epm.c b/packet-dcerpc-epm.c index d919a0f20e..2c2d81e48e 100644 --- a/packet-dcerpc-epm.c +++ b/packet-dcerpc-epm.c @@ -2,7 +2,7 @@ * Routines for dcerpc endpoint mapper dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-epm.c,v 1.24 2003/11/21 08:40:00 guy Exp $ + * $Id: packet-dcerpc-epm.c,v 1.25 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -88,13 +88,13 @@ static const value_string ep_service[] = { [size_is(tower_len)] char tower[]; } twr_t, *twr_p_t; */ -static int epm_dissect_tower (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep); +static int epm_dissect_tower (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep); static int epm_dissect_pointer_IF_ID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -111,7 +111,7 @@ epm_dissect_pointer_IF_ID(tvbuff_t *tvb, int offset, static int epm_dissect_pointer_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -124,7 +124,7 @@ epm_dissect_pointer_UUID(tvbuff_t *tvb, int offset, static int epm_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm_inquiry_type, NULL); @@ -152,7 +152,7 @@ epm_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -206,7 +206,7 @@ epm_dissect_ept_entry_t(tvbuff_t *tvb, int offset, static int epm_dissect_ept_entry_t_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, epm_dissect_ept_entry_t); @@ -217,7 +217,7 @@ epm_dissect_ept_entry_t_array(tvbuff_t *tvb, int offset, static int epm_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, hf_epm_hnd, NULL); @@ -238,7 +238,7 @@ epm_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, static int epm_dissect_uuid (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_epm_uuid, NULL); @@ -313,7 +313,7 @@ static const value_string proto_id_vals[] = { static int epm_dissect_tower_data (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 num_floors, i; dcerpc_info *di; @@ -436,7 +436,7 @@ epm_dissect_tower_data (tvbuff_t *tvb, int offset, static int epm_dissect_tower (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -459,7 +459,7 @@ epm_dissect_tower (tvbuff_t *tvb, int offset, static int epm_dissect_tower_pointer (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, epm_dissect_tower, NDR_POINTER_PTR, @@ -469,7 +469,7 @@ epm_dissect_tower_pointer (tvbuff_t *tvb, int offset, static int epm_dissect_tower_array (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, epm_dissect_tower_pointer); @@ -480,7 +480,7 @@ epm_dissect_tower_array (tvbuff_t *tvb, int offset, static int epm_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, ptr] uuid_p_t object */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -506,7 +506,7 @@ epm_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_map_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -531,7 +531,7 @@ epm_dissect_ept_map_resp (tvbuff_t *tvb, int offset, static int epm_dissect_ept_entry_t_ucarray(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, epm_dissect_ept_entry_t); @@ -542,7 +542,7 @@ epm_dissect_ept_entry_t_ucarray(tvbuff_t *tvb, int offset, static int epm_dissect_ept_insert_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm_num_ents, NULL); @@ -562,7 +562,7 @@ epm_dissect_ept_insert_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_insert_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [out] error_status_t *status */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -575,7 +575,7 @@ epm_dissect_ept_insert_resp (tvbuff_t *tvb, int offset, static int epm_dissect_ept_delete_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm_num_ents, NULL); @@ -592,7 +592,7 @@ epm_dissect_ept_delete_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_delete_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [out] error_status_t *status */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -606,7 +606,7 @@ epm_dissect_ept_delete_resp (tvbuff_t *tvb, int offset, static int epm_dissect_ept_lookup_handle_free_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -618,7 +618,7 @@ epm_dissect_ept_lookup_handle_free_rqst (tvbuff_t *tvb, int offset, static int epm_dissect_ept_lookup_handle_free_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, diff --git a/packet-dcerpc-epm4.c b/packet-dcerpc-epm4.c index ad66e591f5..5a364f4cfa 100644 --- a/packet-dcerpc-epm4.c +++ b/packet-dcerpc-epm4.c @@ -2,7 +2,7 @@ * Routines for dcerpc endpoint mapper dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-epm4.c,v 1.1 2003/11/25 08:10:57 guy Exp $ + * $Id: packet-dcerpc-epm4.c,v 1.2 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -88,13 +88,13 @@ static const value_string ep_service[] = { [size_is(tower_len)] char tower[]; } twr_t, *twr_p_t; */ -static int epm4_dissect_tower (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep); +static int epm4_dissect_tower (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep); static int epm4_dissect_pointer_IF_ID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -111,7 +111,7 @@ epm4_dissect_pointer_IF_ID(tvbuff_t *tvb, int offset, static int epm4_dissect_pointer_UUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -124,7 +124,7 @@ epm4_dissect_pointer_UUID(tvbuff_t *tvb, int offset, static int epm4_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm4_inquiry_type, NULL); @@ -152,7 +152,7 @@ epm4_dissect_ept_lookup_rqst (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_entry_t(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -206,7 +206,7 @@ epm4_dissect_ept_entry_t(tvbuff_t *tvb, int offset, static int epm4_dissect_ept_entry_t_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, epm4_dissect_ept_entry_t); @@ -217,7 +217,7 @@ epm4_dissect_ept_entry_t_array(tvbuff_t *tvb, int offset, static int epm4_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, hf_epm4_hnd, NULL); @@ -238,7 +238,7 @@ epm4_dissect_ept_lookup_resp (tvbuff_t *tvb, int offset, static int epm4_dissect_uuid (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_epm4_uuid, NULL); @@ -313,7 +313,7 @@ static const value_string proto_id_vals[] = { static int epm4_dissect_tower_data (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 num_floors, i; dcerpc_info *di; @@ -436,7 +436,7 @@ epm4_dissect_tower_data (tvbuff_t *tvb, int offset, static int epm4_dissect_tower (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -459,7 +459,7 @@ epm4_dissect_tower (tvbuff_t *tvb, int offset, static int epm4_dissect_tower_pointer (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, epm4_dissect_tower, NDR_POINTER_PTR, @@ -469,7 +469,7 @@ epm4_dissect_tower_pointer (tvbuff_t *tvb, int offset, static int epm4_dissect_tower_array (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, epm4_dissect_tower_pointer); @@ -480,7 +480,7 @@ epm4_dissect_tower_array (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, ptr] uuid_p_t object */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -506,7 +506,7 @@ epm4_dissect_ept_map_rqst (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_map_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -531,7 +531,7 @@ epm4_dissect_ept_map_resp (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_entry_t_ucarray(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, epm4_dissect_ept_entry_t); @@ -542,7 +542,7 @@ epm4_dissect_ept_entry_t_ucarray(tvbuff_t *tvb, int offset, static int epm4_dissect_ept_insert_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm4_num_ents, NULL); @@ -562,7 +562,7 @@ epm4_dissect_ept_insert_rqst (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_insert_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [out] error_status_t *status */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -575,7 +575,7 @@ epm4_dissect_ept_insert_resp (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_delete_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_epm4_num_ents, NULL); @@ -592,7 +592,7 @@ epm4_dissect_ept_delete_rqst (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_delete_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [out] error_status_t *status */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -606,7 +606,7 @@ epm4_dissect_ept_delete_resp (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_lookup_handle_free_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, @@ -618,7 +618,7 @@ epm4_dissect_ept_lookup_handle_free_rqst (tvbuff_t *tvb, int offset, static int epm4_dissect_ept_lookup_handle_free_resp (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in, out] ept_lookup_handle_t *entry_handle */ offset = dissect_ndr_ctx_hnd (tvb, offset, pinfo, tree, drep, diff --git a/packet-dcerpc-initshutdown.c b/packet-dcerpc-initshutdown.c index e46c006817..4fd58210c6 100644 --- a/packet-dcerpc-initshutdown.c +++ b/packet-dcerpc-initshutdown.c @@ -4,7 +4,7 @@ * Copyright 2001-2003 Tim Potter <tpot@samba.org> * as per a suggestion by Jim McDonough * - * $Id: packet-dcerpc-initshutdown.c,v 1.1 2003/10/27 23:31:54 guy Exp $ + * $Id: packet-dcerpc-initshutdown.c,v 1.2 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -50,7 +50,7 @@ static int hf_shutdown_reason = -1; /* Reg Shutdown functions */ static int dissect_shutdown_server(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint16( tvb, offset, pinfo, tree, drep, hf_shutdown_server, NULL); @@ -60,7 +60,7 @@ dissect_shutdown_server(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_shutdown_message(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_counted_string( tvb, offset, pinfo, tree, drep, hf_shutdown_message, 0); @@ -70,7 +70,7 @@ dissect_shutdown_message(tvbuff_t *tvb, int offset, packet_info *pinfo, static int InitshutdownShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, @@ -95,7 +95,7 @@ InitshutdownShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int InitshutdownShutdown_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_rc, NULL); @@ -105,7 +105,7 @@ InitshutdownShutdown_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int InitshutdownAbortShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, @@ -117,7 +117,7 @@ InitshutdownAbortShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int InitshutdownShutdownEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = InitshutdownShutdown_q(tvb, offset, pinfo, tree, drep); offset = dissect_ndr_uint32( diff --git a/packet-dcerpc-krb5rpc.c b/packet-dcerpc-krb5rpc.c index 41b8475992..d54e463557 100644 --- a/packet-dcerpc-krb5rpc.c +++ b/packet-dcerpc-krb5rpc.c @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/krb5rpc.idl * - * $Id: packet-dcerpc-krb5rpc.c,v 1.6 2003/08/04 02:49:02 tpot Exp $ + * $Id: packet-dcerpc-krb5rpc.c,v 1.7 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -67,7 +67,7 @@ static gint ett_krb5rpc_krb5 = -1; static int krb5rpc_dissect_sendto_kdc_rqst (tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, - char *drep) + guint8 *drep) { guint32 keysize, spare1, remain; proto_item *item; @@ -104,7 +104,7 @@ krb5rpc_dissect_sendto_kdc_rqst (tvbuff_t * tvb, int offset, static int krb5rpc_dissect_sendto_kdc_resp (tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, - char *drep) + guint8 *drep) { guint32 resp_len, maxsize, spare1, keysize, remain; proto_item *item; diff --git a/packet-dcerpc-lsa-ds.c b/packet-dcerpc-lsa-ds.c index 889099fb8d..46a18470f1 100644 --- a/packet-dcerpc-lsa-ds.c +++ b/packet-dcerpc-lsa-ds.c @@ -3,7 +3,7 @@ * Copyright 2002-2003, Tim Potter <tpot@samba.org> * Copyright 2002, Jim McDonough <jmcd@samba.org> * - * $Id: packet-dcerpc-lsa-ds.c,v 1.12 2003/08/04 02:49:02 tpot Exp $ + * $Id: packet-dcerpc-lsa-ds.c,v 1.13 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -64,7 +64,7 @@ static gint ett_lsa_ds_op_status = -1; static int lsa_ds_dissect_DSROLE_BASIC_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -106,7 +106,7 @@ lsa_ds_dissect_DSROLE_BASIC_INFO(tvbuff_t *tvb, int offset, static int lsa_ds_dissect_DSROLE_UPGRADE_STATUS(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep) + proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -131,7 +131,7 @@ lsa_ds_dissect_DSROLE_UPGRADE_STATUS(tvbuff_t *tvb, int offset, static int lsa_ds_dissect_DSROLE_OP_STATUS(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep) + proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -152,7 +152,7 @@ lsa_ds_dissect_DSROLE_OP_STATUS(tvbuff_t *tvb, int offset, static int lsa_ds_dissect_DS_DOMINFO_CTR(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -189,7 +189,7 @@ lsa_ds_dissect_DS_DOMINFO_CTR(tvbuff_t *tvb, int offset, static int lsa_ds_dissect_role_get_dom_info_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint16 level; @@ -204,7 +204,7 @@ lsa_ds_dissect_role_get_dom_info_rqst(tvbuff_t *tvb, int offset, static int lsa_ds_dissect_role_get_dom_info_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_ds_dissect_DS_DOMINFO_CTR, NDR_POINTER_UNIQUE, diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c index d7a87395fc..87833578dc 100644 --- a/packet-dcerpc-lsa.c +++ b/packet-dcerpc-lsa.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 Added LSA command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-lsa.c,v 1.91 2003/09/29 00:01:26 tpot Exp $ + * $Id: packet-dcerpc-lsa.c,v 1.92 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -166,7 +166,7 @@ static gint ett_lsa_auth_information = -1; static int lsa_dissect_pointer_NTTIME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -185,7 +185,7 @@ lsa_dissect_pointer_NTTIME(tvbuff_t *tvb, int offset, static int lsa_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -203,7 +203,7 @@ lsa_dissect_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, static int lsa_dissect_pointer_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -223,7 +223,7 @@ lsa_dissect_pointer_pointer_UNICODE_STRING(tvbuff_t *tvb, int offset, static int lsa_dissect_pointer_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -242,7 +242,7 @@ lsa_dissect_pointer_STRING(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_SECRET_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -268,7 +268,7 @@ lsa_dissect_LSA_SECRET_data(tvbuff_t *tvb, int offset, int lsa_dissect_LSA_SECRET(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -296,7 +296,7 @@ lsa_dissect_LSA_SECRET(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_SECRET_pointer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_SECRET, NDR_POINTER_UNIQUE, @@ -367,7 +367,7 @@ struct access_mask_info lsa_access_mask_info = { int lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -391,7 +391,7 @@ lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, int lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -416,7 +416,7 @@ lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset, static int lsa_dissect_LPSTR(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint8 (tvb, offset, pinfo, tree, drep, hf_lsa_unknown_char, NULL); @@ -435,7 +435,7 @@ static const value_string lsa_impersonation_level_vals[] = { static int lsa_dissect_SECURITY_QUALITY_OF_SERVICE(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* Length */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -458,7 +458,7 @@ lsa_dissect_SECURITY_QUALITY_OF_SERVICE(tvbuff_t *tvb, int offset, static int lsa_dissect_ACCESS_MASK(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_access_mask( tvb, offset, pinfo, tree, drep, hf_lsa_access_mask, @@ -469,7 +469,7 @@ lsa_dissect_ACCESS_MASK(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { int old_offset=offset; proto_item *item = NULL; @@ -514,7 +514,7 @@ lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarclose_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, TRUE); @@ -524,7 +524,7 @@ lsa_dissect_lsarclose_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarclose_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -541,7 +541,7 @@ lsa_dissect_lsarclose_reply(tvbuff_t *tvb, int offset, static int dissect_lsa_openpolicy_server(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { return dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_lsa_server, NULL); @@ -549,7 +549,7 @@ static int dissect_lsa_openpolicy_server(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropenpolicy_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_lsa_openpolicy_server, NDR_POINTER_UNIQUE, @@ -567,7 +567,7 @@ lsa_dissect_lsaropenpolicy_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropenpolicy_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -592,7 +592,7 @@ lsa_dissect_lsaropenpolicy_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropenpolicy2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep, dissect_ndr_wchar_cvstring, NDR_POINTER_UNIQUE, "Server", @@ -612,7 +612,7 @@ lsa_dissect_lsaropenpolicy2_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropenpolicy2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -663,7 +663,7 @@ static const value_string policy_information_class_vals[] = { static int lsa_dissect_lsarqueryinformationpolicy_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint16 level; @@ -684,7 +684,7 @@ lsa_dissect_lsarqueryinformationpolicy_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_AUDIT_LOG_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -726,7 +726,7 @@ lsa_dissect_POLICY_AUDIT_LOG_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_AUDIT_EVENTS_INFO_settings(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_lsa_paei_settings, NULL); @@ -735,7 +735,7 @@ lsa_dissect_POLICY_AUDIT_EVENTS_INFO_settings(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_AUDIT_EVENTS_INFO_settings_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_POLICY_AUDIT_EVENTS_INFO_settings); @@ -745,7 +745,7 @@ lsa_dissect_POLICY_AUDIT_EVENTS_INFO_settings_array(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_AUDIT_EVENTS_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -777,7 +777,7 @@ lsa_dissect_POLICY_AUDIT_EVENTS_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_PRIMARY_DOMAIN_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -804,7 +804,7 @@ lsa_dissect_POLICY_PRIMARY_DOMAIN_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_ACCOUNT_DOMAIN_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -838,7 +838,7 @@ static const value_string server_role_vals[] = { }; static int lsa_dissect_POLICY_SERVER_ROLE_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -860,7 +860,7 @@ lsa_dissect_POLICY_SERVER_ROLE_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_REPLICA_SOURCE_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -887,7 +887,7 @@ lsa_dissect_POLICY_REPLICA_SOURCE_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_DEFAULT_QUOTA_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -930,7 +930,7 @@ lsa_dissect_POLICY_DEFAULT_QUOTA_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_MODIFICATION_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -957,7 +957,7 @@ lsa_dissect_POLICY_MODIFICATION_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_AUDIT_FULL_SET_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -980,7 +980,7 @@ lsa_dissect_POLICY_AUDIT_FULL_SET_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_AUDIT_FULL_QUERY_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1007,7 +1007,7 @@ lsa_dissect_POLICY_AUDIT_FULL_QUERY_INFO(tvbuff_t *tvb, int offset, int lsa_dissect_POLICY_DNS_DOMAIN_INFO(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1044,7 +1044,7 @@ lsa_dissect_POLICY_DNS_DOMAIN_INFO(tvbuff_t *tvb, int offset, static int lsa_dissect_POLICY_INFORMATION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1118,7 +1118,7 @@ lsa_dissect_POLICY_INFORMATION(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarqueryinformationpolicy_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* This is really a pointer to a pointer though the first level is REF so we just ignore that one */ @@ -1134,7 +1134,7 @@ lsa_dissect_lsarqueryinformationpolicy_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsardelete_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1144,7 +1144,7 @@ lsa_dissect_lsardelete_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsardelete_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1155,7 +1155,7 @@ lsa_dissect_lsardelete_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerysecurityobject_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1169,7 +1169,7 @@ lsa_dissect_lsarquerysecurityobject_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerysecurityobject_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE, @@ -1184,7 +1184,7 @@ lsa_dissect_lsarquerysecurityobject_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetsecurityobject_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1201,7 +1201,7 @@ lsa_dissect_lsarsetsecurityobject_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetsecurityobject_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1212,7 +1212,7 @@ lsa_dissect_lsarsetsecurityobject_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarchangepassword_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* server */ offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, @@ -1239,7 +1239,7 @@ lsa_dissect_lsarchangepassword_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarchangepassword_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1261,7 +1261,7 @@ static const value_string sid_type_vals[] = { }; static int lsa_dissect_LSA_TRANSLATED_NAME(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1291,7 +1291,7 @@ lsa_dissect_LSA_TRANSLATED_NAME(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_NAME_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_TRANSLATED_NAME); @@ -1301,7 +1301,7 @@ lsa_dissect_LSA_TRANSLATED_NAME_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_NAMES(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1329,7 +1329,7 @@ lsa_dissect_LSA_TRANSLATED_NAMES(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupsids_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1353,7 +1353,7 @@ lsa_dissect_lsarlookupsids_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUST_INFORMATION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1410,7 +1410,7 @@ static const true_false_string tfs_trust_attr_tree_root = { }; static int lsa_dissect_trust_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep) + proto_tree *parent_tree, guint8 *drep) { guint32 mask; proto_item *item = NULL; @@ -1439,7 +1439,7 @@ lsa_dissect_trust_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, static int lsa_dissect_LSA_TRUST_INFORMATION_EX(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1480,7 +1480,7 @@ lsa_dissect_LSA_TRUST_INFORMATION_EX(tvbuff_t *tvb, int offset, static int lsa_dissect_auth_info_blob(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { dcerpc_info *di; guint32 len; @@ -1503,7 +1503,7 @@ lsa_dissect_auth_info_blob(tvbuff_t *tvb, int offset, static int lsa_dissect_auth_info(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1538,7 +1538,7 @@ lsa_dissect_auth_info(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUSTED_DOMAIN_AUTH_INFORMATION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1577,7 +1577,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_AUTH_INFORMATION(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUST_INFORMATION_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_TRUST_INFORMATION); @@ -1587,7 +1587,7 @@ lsa_dissect_LSA_TRUST_INFORMATION_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_REFERENCED_DOMAIN_LIST(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1618,7 +1618,7 @@ lsa_dissect_LSA_REFERENCED_DOMAIN_LIST(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupsids_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_REFERENCED_DOMAIN_LIST, NDR_POINTER_UNIQUE, @@ -1640,7 +1640,7 @@ lsa_dissect_lsarlookupsids_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetquotasforaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1655,7 +1655,7 @@ lsa_dissect_lsarsetquotasforaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetquotasforaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1666,7 +1666,7 @@ lsa_dissect_lsarsetquotasforaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsargetquotasforaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1677,7 +1677,7 @@ lsa_dissect_lsargetquotasforaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsargetquotasforaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_POLICY_DEFAULT_QUOTA_INFO, NDR_POINTER_REF, @@ -1692,7 +1692,7 @@ lsa_dissect_lsargetquotasforaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetinformationpolicy_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1710,7 +1710,7 @@ lsa_dissect_lsarsetinformationpolicy_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetinformationpolicy_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1721,7 +1721,7 @@ lsa_dissect_lsarsetinformationpolicy_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarclearauditlog_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1739,7 +1739,7 @@ lsa_dissect_lsarclearauditlog_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarclearauditlog_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1752,7 +1752,7 @@ lsa_dissect_lsarclearauditlog_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsargetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1763,7 +1763,7 @@ lsa_dissect_lsargetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsargetsystemaccessaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_lsa_rid, NULL); @@ -1777,7 +1777,7 @@ lsa_dissect_lsargetsystemaccessaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1791,7 +1791,7 @@ lsa_dissect_lsarsetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetsystemaccessaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1802,7 +1802,7 @@ lsa_dissect_lsarsetsystemaccessaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropentrusteddomain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1819,7 +1819,7 @@ lsa_dissect_lsaropentrusteddomain_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropentrusteddomain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1833,7 +1833,7 @@ lsa_dissect_lsaropentrusteddomain_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsardeletetrusteddomain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1847,7 +1847,7 @@ lsa_dissect_lsardeletetrusteddomain_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsardeletetrusteddomain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -1857,7 +1857,7 @@ lsa_dissect_lsardeletetrusteddomain_reply(tvbuff_t *tvb, int offset, int dissect_nt_LUID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1881,7 +1881,7 @@ dissect_nt_LUID(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_PRIVILEGE(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1906,7 +1906,7 @@ lsa_dissect_LSA_PRIVILEGE(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_PRIVILEGE_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_PRIVILEGE); @@ -1916,7 +1916,7 @@ lsa_dissect_LSA_PRIVILEGE_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_PRIVILEGES(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1942,7 +1942,7 @@ lsa_dissect_LSA_PRIVILEGES(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateprivileges_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1958,7 +1958,7 @@ lsa_dissect_lsarenumerateprivileges_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateprivileges_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_lsa_count, NULL); @@ -1975,7 +1975,7 @@ lsa_dissect_lsarenumerateprivileges_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupprivilegevalue_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -1991,7 +1991,7 @@ lsa_dissect_lsarlookupprivilegevalue_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupprivilegevalue_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* LUID */ @@ -2006,7 +2006,7 @@ lsa_dissect_lsarlookupprivilegevalue_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupprivilegename_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -2022,7 +2022,7 @@ lsa_dissect_lsarlookupprivilegename_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupprivilegename_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] LSA_UNICODE_STRING **name */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2038,7 +2038,7 @@ lsa_dissect_lsarlookupprivilegename_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateprivilegesaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2050,7 +2050,7 @@ lsa_dissect_lsarenumerateprivilegesaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_LUID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2075,7 +2075,7 @@ lsa_dissect_LUID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, static int lsa_dissect_LUID_AND_ATTRIBUTES_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LUID_AND_ATTRIBUTES); @@ -2085,7 +2085,7 @@ lsa_dissect_LUID_AND_ATTRIBUTES_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LUID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2111,7 +2111,7 @@ lsa_dissect_LUID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateprivilegesaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] LUID_AND_ATTRIBUTES_ARRAY * *privs */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2126,7 +2126,7 @@ lsa_dissect_lsarenumerateprivilegesaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaraddprivilegestoaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2142,7 +2142,7 @@ lsa_dissect_lsaraddprivilegestoaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaraddprivilegestoaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -2152,7 +2152,7 @@ lsa_dissect_lsaraddprivilegestoaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarremoveprivilegesfromaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2173,7 +2173,7 @@ lsa_dissect_lsarremoveprivilegesfromaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarremoveprivilegesfromaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -2183,7 +2183,7 @@ lsa_dissect_lsarremoveprivilegesfromaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateaccounts_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2202,7 +2202,7 @@ lsa_dissect_lsarenumerateaccounts_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateaccounts_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in,out, ref] LSA_ENUMERATION_HANDLE *resume_hnd */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2221,7 +2221,7 @@ lsa_dissect_lsarenumerateaccounts_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatetrusteddomain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd_pol */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2241,7 +2241,7 @@ lsa_dissect_lsarcreatetrusteddomain_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatetrusteddomain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE *hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2255,7 +2255,7 @@ lsa_dissect_lsarcreatetrusteddomain_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumeratetrusteddomains_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2274,7 +2274,7 @@ lsa_dissect_lsarenumeratetrusteddomains_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUSTED_DOMAIN(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2300,7 +2300,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUSTED_DOMAIN_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_TRUSTED_DOMAIN); @@ -2310,7 +2310,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUSTED_DOMAIN_LIST(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2336,7 +2336,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_LIST(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumeratetrusteddomains_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out, ref] LSA_ENUMERATION_HANDLE *resume_hnd */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -2356,7 +2356,7 @@ lsa_dissect_lsarenumeratetrusteddomains_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_UNICODE_STRING_item(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { dcerpc_info *di; @@ -2374,7 +2374,7 @@ lsa_dissect_LSA_UNICODE_STRING_item(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_UNICODE_STRING_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_UNICODE_STRING_item); @@ -2384,7 +2384,7 @@ lsa_dissect_LSA_UNICODE_STRING_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { dcerpc_info *di; @@ -2401,7 +2401,7 @@ lsa_dissect_LSA_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_SID(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* sid type */ offset = dissect_ndr_uint16 (tvb, offset, pinfo, tree, drep, @@ -2418,7 +2418,7 @@ lsa_dissect_LSA_TRANSLATED_SID(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_SIDS_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_TRANSLATED_SID); @@ -2428,7 +2428,7 @@ lsa_dissect_LSA_TRANSLATED_SIDS_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_SIDS(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2455,7 +2455,7 @@ lsa_dissect_LSA_TRANSLATED_SIDS(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupnames_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2489,7 +2489,7 @@ lsa_dissect_lsarlookupnames_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupnames_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_REFERENCED_DOMAIN_LIST *domains */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2513,7 +2513,7 @@ lsa_dissect_lsarlookupnames_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatesecret_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd_pol */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2532,7 +2532,7 @@ lsa_dissect_lsarcreatesecret_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatesecret_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE *hnd */ @@ -2547,7 +2547,7 @@ lsa_dissect_lsarcreatesecret_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropenaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd_pol */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2567,7 +2567,7 @@ lsa_dissect_lsaropenaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropenaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE *hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2595,7 +2595,7 @@ static const value_string trusted_info_level_vals[] = { static int lsa_dissect_TRUSTED_DOMAIN_INFORMATION(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2668,7 +2668,7 @@ lsa_dissect_TRUSTED_DOMAIN_INFORMATION(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarqueryinfotrusteddomain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2684,7 +2684,7 @@ lsa_dissect_lsarqueryinfotrusteddomain_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarqueryinfotrusteddomain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] TRUSTED_DOMAIN_INFORMATION *info */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2699,7 +2699,7 @@ lsa_dissect_lsarqueryinfotrusteddomain_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetinformationtrusteddomain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2720,7 +2720,7 @@ lsa_dissect_lsarsetinformationtrusteddomain_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetinformationtrusteddomain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -2730,7 +2730,7 @@ lsa_dissect_lsarsetinformationtrusteddomain_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropensecret_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd_pol */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2752,7 +2752,7 @@ lsa_dissect_lsaropensecret_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropensecret_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE *hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2766,7 +2766,7 @@ lsa_dissect_lsaropensecret_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetsecret_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2788,7 +2788,7 @@ lsa_dissect_lsarsetsecret_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetsecret_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -2798,7 +2798,7 @@ lsa_dissect_lsarsetsecret_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerysecret_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2830,7 +2830,7 @@ lsa_dissect_lsarquerysecret_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerysecret_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out, unique] LSA_SECRET **curr_val */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2860,7 +2860,7 @@ lsa_dissect_lsarquerysecret_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsardeleteobject_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2872,7 +2872,7 @@ lsa_dissect_lsardeleteobject_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsardeleteobject_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -2882,7 +2882,7 @@ lsa_dissect_lsardeleteobject_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateaccountswithuserright_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2898,7 +2898,7 @@ lsa_dissect_lsarenumerateaccountswithuserright_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateaccountswithuserright_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] LSA_UNICODE_STRING_ARRAY *accounts */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2913,7 +2913,7 @@ lsa_dissect_lsarenumerateaccountswithuserright_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateaccountrights_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2929,7 +2929,7 @@ lsa_dissect_lsarenumerateaccountrights_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumerateaccountrights_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] LSA_UNICODE_STRING_ARRAY *rights */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -2944,7 +2944,7 @@ lsa_dissect_lsarenumerateaccountrights_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaraddaccountrights_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -2965,7 +2965,7 @@ lsa_dissect_lsaraddaccountrights_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaraddaccountrights_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -2975,7 +2975,7 @@ lsa_dissect_lsaraddaccountrights_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarremoveaccountrights_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3000,7 +3000,7 @@ lsa_dissect_lsarremoveaccountrights_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarremoveaccountrights_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -3011,7 +3011,7 @@ lsa_dissect_lsarremoveaccountrights_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerytrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3032,7 +3032,7 @@ lsa_dissect_lsarquerytrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerytrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] TRUSTED_DOMAIN_INFORMATION *info) */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3048,7 +3048,7 @@ lsa_dissect_lsarquerytrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsettrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3074,7 +3074,7 @@ lsa_dissect_lsarsettrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsettrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -3084,7 +3084,7 @@ lsa_dissect_lsarsettrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerytrusteddomaininfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3103,7 +3103,7 @@ lsa_dissect_lsarquerytrusteddomaininfo_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropentrusteddomainbyname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3124,7 +3124,7 @@ lsa_dissect_lsaropentrusteddomainbyname_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsaropentrusteddomainbyname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3140,7 +3140,7 @@ lsa_dissect_lsaropentrusteddomainbyname_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerytrusteddomaininfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] TRUSTED_DOMAIN_INFORMATION *info) */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3155,7 +3155,7 @@ lsa_dissect_lsarquerytrusteddomaininfo_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsettrusteddomaininfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3180,7 +3180,7 @@ lsa_dissect_lsarsettrusteddomaininfo_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsettrusteddomaininfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -3190,7 +3190,7 @@ lsa_dissect_lsarsettrusteddomaininfo_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarqueryinformationpolicy2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -3203,7 +3203,7 @@ lsa_dissect_lsarqueryinformationpolicy2_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarqueryinformationpolicy2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* This is really a pointer to a pointer though the first level is REF so we just ignore that one */ @@ -3219,7 +3219,7 @@ lsa_dissect_lsarqueryinformationpolicy2_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetinformationpolicy2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -3236,7 +3236,7 @@ lsa_dissect_lsarsetinformationpolicy2_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetinformationpolicy2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -3246,7 +3246,7 @@ lsa_dissect_lsarsetinformationpolicy2_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerydomaininformationpolicy_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -3259,7 +3259,7 @@ lsa_dissect_lsarquerydomaininformationpolicy_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarquerydomaininformationpolicy_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_POLICY_INFORMATION, NDR_POINTER_REF, @@ -3273,7 +3273,7 @@ lsa_dissect_lsarquerydomaininformationpolicy_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetdomaininformationpolicy_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -3290,7 +3290,7 @@ lsa_dissect_lsarsetdomaininformationpolicy_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarsetdomaininformationpolicy_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -3300,7 +3300,7 @@ lsa_dissect_lsarsetdomaininformationpolicy_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupnames2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3342,7 +3342,7 @@ lsa_dissect_lsarlookupnames2_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupnames2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_REFERENCED_DOMAIN_LIST *domains */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3367,7 +3367,7 @@ lsa_dissect_lsarlookupnames2_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreateaccount_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3384,7 +3384,7 @@ lsa_dissect_lsarcreateaccount_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreateaccount_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -3397,7 +3397,7 @@ lsa_dissect_lsarcreateaccount_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupprivilegedisplayname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3417,7 +3417,7 @@ lsa_dissect_lsarlookupprivilegedisplayname_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupprivilegedisplayname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] LSA_UNICODE_STRING **disp_name */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3436,7 +3436,7 @@ lsa_dissect_lsarlookupprivilegedisplayname_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarstoreprivatedata_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3457,7 +3457,7 @@ lsa_dissect_lsarstoreprivatedata_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarstoreprivatedata_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_lsa_rc, NULL); @@ -3467,7 +3467,7 @@ lsa_dissect_lsarstoreprivatedata_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarretrieveprivatedata_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3488,7 +3488,7 @@ lsa_dissect_lsarretrieveprivatedata_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarretrieveprivatedata_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out, ref] LSA_SECRET **data */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3503,7 +3503,7 @@ lsa_dissect_lsarretrieveprivatedata_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarclosetrusteddomainex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out] LSA_HANDLE *tdHnd */ @@ -3516,7 +3516,7 @@ lsa_dissect_lsarclosetrusteddomainex_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarclosetrusteddomainex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out] LSA_HANDLE *tdHnd */ @@ -3531,7 +3531,7 @@ lsa_dissect_lsarclosetrusteddomainex_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_NAME_EX(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3565,7 +3565,7 @@ lsa_dissect_LSA_TRANSLATED_NAME_EX(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRANSLATED_NAME_EX_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_TRANSLATED_NAME_EX); @@ -3574,7 +3574,7 @@ lsa_dissect_LSA_TRANSLATED_NAME_EX_array(tvbuff_t *tvb, int offset, } static int lsa_dissect_LSA_TRANSLATED_NAMES_EX(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* count */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -3590,7 +3590,7 @@ lsa_dissect_LSA_TRANSLATED_NAMES_EX(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupsids2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_lsa_hnd, NULL, NULL, FALSE, FALSE); @@ -3622,7 +3622,7 @@ lsa_dissect_lsarlookupsids2_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarlookupsids2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_REFERENCED_DOMAIN_LIST, NDR_POINTER_UNIQUE, @@ -3643,7 +3643,7 @@ lsa_dissect_lsarlookupsids2_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsargetusername_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, unique, string] WCHAR *server */ @@ -3667,7 +3667,7 @@ lsa_dissect_lsargetusername_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsargetusername_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out, ref] LSA_UNICODE_STRING **user */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3687,7 +3687,7 @@ lsa_dissect_lsargetusername_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatetrusteddomainex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3713,7 +3713,7 @@ lsa_dissect_lsarcreatetrusteddomainex_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatetrusteddomainex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE *tdHnd) */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3727,7 +3727,7 @@ lsa_dissect_lsarcreatetrusteddomainex_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumeratetrusteddomainsex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3747,7 +3747,7 @@ lsa_dissect_lsarenumeratetrusteddomainsex_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUSTED_DOMAIN_INFORMATION_EX_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_TRUST_INFORMATION_EX); @@ -3757,7 +3757,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_INFORMATION_EX_array(tvbuff_t *tvb, int offset, static int lsa_dissect_LSA_TRUSTED_DOMAIN_INFORMATION_LIST_EX(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* count */ offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, @@ -3779,7 +3779,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_INFORMATION_LIST_EX(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarenumeratetrusteddomainsex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in, out, ref] LSA_ENUMERATION_HANDLE *resume_hnd */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -3798,7 +3798,7 @@ lsa_dissect_lsarenumeratetrusteddomainsex_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsartestcall_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE handle */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3819,7 +3819,7 @@ lsa_dissect_lsartestcall_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsartestcall_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out, ref] LSA_SECURITY_DESCRIPTOR **psd) */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -3834,7 +3834,7 @@ lsa_dissect_lsartestcall_reply(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatetrusteddomainex2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [in] LSA_HANDLE hnd */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, @@ -3860,7 +3860,7 @@ lsa_dissect_lsarcreatetrusteddomainex2_rqst(tvbuff_t *tvb, int offset, static int lsa_dissect_lsarcreatetrusteddomainex2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* [out] LSA_HANDLE *h2) */ offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h index dfebdc7f5d..500ba00ce4 100644 --- a/packet-dcerpc-lsa.h +++ b/packet-dcerpc-lsa.h @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\lsarpc packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-lsa.h,v 1.12 2003/09/29 00:01:26 tpot Exp $ + * $Id: packet-dcerpc-lsa.h,v 1.13 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -112,20 +112,20 @@ int lsa_dissect_LSA_SECURITY_DESCRIPTOR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep); + guint8 *drep); int lsa_dissect_LSA_SECURITY_DESCRIPTOR_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep); + guint8 *drep); int lsa_dissect_LSA_SECRET(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); int lsa_dissect_POLICY_DNS_DOMAIN_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); /* Specific access rights */ diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c index 784076be59..611cf09254 100644 --- a/packet-dcerpc-mapi.c +++ b/packet-dcerpc-mapi.c @@ -2,7 +2,7 @@ * Routines for MS Exchange MAPI * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-mapi.c,v 1.25 2003/10/24 00:42:16 guy Exp $ + * $Id: packet-dcerpc-mapi.c,v 1.26 2004/01/19 20:10:33 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -139,7 +139,7 @@ mapi_decrypt_init(void) static int mapi_decrypt_pdu(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { dcerpc_info *di; mapi_decrypted_data_t *mmd=NULL; @@ -236,7 +236,7 @@ mapi_decrypt_pdu(tvbuff_t *tvb, int offset, static int mapi_logon_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, sizeof(guint8), hf_mapi_unknown_string, TRUE, NULL); @@ -251,7 +251,7 @@ There might be offsets/padding mismatched due to potential pointer expansions or padding bytes. Captures where this code breaks will tell us about that */ static int mapi_logon_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_mapi_hnd, NULL, NULL, FALSE, FALSE); @@ -281,7 +281,7 @@ mapi_logon_reply(tvbuff_t *tvb, int offset, static int mapi_ec_do_rpc_request(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_mapi_hnd, NULL, NULL, FALSE, FALSE); @@ -307,7 +307,7 @@ mapi_ec_do_rpc_request(tvbuff_t *tvb, int offset, } static int mapi_ec_do_rpc_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_mapi_hnd, NULL, NULL, FALSE, FALSE); @@ -334,7 +334,7 @@ mapi_ec_do_rpc_reply(tvbuff_t *tvb, int offset, static int mapi_logoff_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_mapi_hnd, NULL, NULL, FALSE, FALSE); @@ -344,7 +344,7 @@ mapi_logoff_rqst(tvbuff_t *tvb, int offset, static int mapi_logoff_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_mapi_hnd, NULL, NULL, FALSE, FALSE); diff --git a/packet-dcerpc-messenger.c b/packet-dcerpc-messenger.c index 1be543e598..6fb350b9c2 100644 --- a/packet-dcerpc-messenger.c +++ b/packet-dcerpc-messenger.c @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\msgsvc packet disassembly * Copyright 2003 Ronnie Sahlberg * - * $Id: packet-dcerpc-messenger.c,v 1.5 2003/09/27 23:45:25 sahlberg Exp $ + * $Id: packet-dcerpc-messenger.c,v 1.6 2004/01/19 20:10:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -65,7 +65,7 @@ static guint16 ver_dcerpc_messenger = 1; */ static int messenger_dissect_send_message_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_char_cvstring, NDR_POINTER_REF, @@ -82,7 +82,7 @@ messenger_dissect_send_message_rqst(tvbuff_t *tvb, int offset, packet_info *pinf } static int messenger_dissect_send_message_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_messenger_rc, NULL); diff --git a/packet-dcerpc-ndr.c b/packet-dcerpc-ndr.c index 98e59fc36c..60d20365dd 100644 --- a/packet-dcerpc-ndr.c +++ b/packet-dcerpc-ndr.c @@ -2,7 +2,7 @@ * Routines for DCERPC NDR dissection * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-ndr.c,v 1.14 2003/11/21 02:48:11 guy Exp $ + * $Id: packet-dcerpc-ndr.c,v 1.15 2004/01/19 20:10:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -43,7 +43,7 @@ int dissect_ndr_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint8 *pdata) { dcerpc_info *di; @@ -61,7 +61,7 @@ dissect_ndr_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint16 *pdata) { dcerpc_info *di; @@ -82,7 +82,7 @@ dissect_ndr_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata) { dcerpc_info *di; @@ -103,7 +103,7 @@ dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, unsigned char *pdata) { dcerpc_info *di; @@ -124,7 +124,7 @@ dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_float(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gfloat *pdata) { dcerpc_info *di; @@ -146,7 +146,7 @@ dissect_ndr_float(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_double(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gdouble *pdata) { dcerpc_info *di; @@ -168,7 +168,7 @@ dissect_ndr_double(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* handles unix 32 bit time_t */ int dissect_ndr_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata) { dcerpc_info *di; @@ -189,7 +189,7 @@ dissect_ndr_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, e_uuid_t *pdata) { e_uuid_t uuid; @@ -245,7 +245,7 @@ dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, */ int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, e_ctx_hnd *pdata) { static e_ctx_hnd ctx_hnd; diff --git a/packet-dcerpc-netlogon.c b/packet-dcerpc-netlogon.c index 7c9c9708a0..d7433ae993 100644 --- a/packet-dcerpc-netlogon.c +++ b/packet-dcerpc-netlogon.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 structure and command dissectors by Ronnie Sahlberg * - * $Id: packet-dcerpc-netlogon.c,v 1.95 2003/11/02 03:55:32 tpot Exp $ + * $Id: packet-dcerpc-netlogon.c,v 1.96 2004/01/19 20:10:34 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -259,7 +259,7 @@ static guint16 ver_dcerpc_netlogon = 1; static int netlogon_dissect_LOGONSRV_HANDLE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server Handle", @@ -290,7 +290,7 @@ netlogon_dissect_LOGONSRV_HANDLE(tvbuff_t *tvb, int offset, static int netlogon_dissect_VALIDATION_UAS_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -366,7 +366,7 @@ netlogon_dissect_VALIDATION_UAS_INFO(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogonuaslogon_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -383,7 +383,7 @@ netlogon_dissect_netrlogonuaslogon_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonuaslogon_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_VALIDATION_UAS_INFO, NDR_POINTER_UNIQUE, @@ -404,7 +404,7 @@ netlogon_dissect_netrlogonuaslogon_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_LOGOFF_UAS_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -433,7 +433,7 @@ netlogon_dissect_LOGOFF_UAS_INFO(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogonuaslogoff_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -450,7 +450,7 @@ netlogon_dissect_netrlogonuaslogoff_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonuaslogoff_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_LOGOFF_UAS_INFO, NDR_POINTER_REF, @@ -477,7 +477,7 @@ netlogon_dissect_netrlogonuaslogoff_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -530,7 +530,7 @@ netlogon_dissect_LOGON_IDENTITY_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep _U_) + guint8 *drep _U_) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -563,7 +563,7 @@ netlogon_dissect_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset, static int netlogon_dissect_NT_OWF_PASSWORD(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep _U_) + guint8 *drep _U_) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -599,7 +599,7 @@ netlogon_dissect_NT_OWF_PASSWORD(tvbuff_t *tvb, int offset, static int netlogon_dissect_INTERACTIVE_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = netlogon_dissect_LOGON_IDENTITY_INFO(tvb, offset, pinfo, tree, drep); @@ -621,7 +621,7 @@ netlogon_dissect_INTERACTIVE_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_CHALLENGE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -671,7 +671,7 @@ static void dissect_nt_chal_resp_cb(packet_info *pinfo _U_, proto_tree *tree, static int netlogon_dissect_NETWORK_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = netlogon_dissect_LOGON_IDENTITY_INFO(tvb, offset, pinfo, tree, drep); @@ -699,7 +699,7 @@ netlogon_dissect_NETWORK_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_SERVICE_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = netlogon_dissect_LOGON_IDENTITY_INFO(tvb, offset, pinfo, tree, drep); @@ -723,7 +723,7 @@ netlogon_dissect_SERVICE_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_LEVEL(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -760,7 +760,7 @@ netlogon_dissect_LEVEL(tvbuff_t *tvb, int offset, static int netlogon_dissect_CREDENTIAL(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -787,7 +787,7 @@ netlogon_dissect_CREDENTIAL(tvbuff_t *tvb, int offset, static int netlogon_dissect_AUTHENTICATOR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; nstime_t ts; @@ -827,7 +827,7 @@ netlogon_dissect_AUTHENTICATOR(tvbuff_t *tvb, int offset, static int netlogon_dissect_GROUP_MEMBERSHIP(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -850,7 +850,7 @@ netlogon_dissect_GROUP_MEMBERSHIP(tvbuff_t *tvb, int offset, static int netlogon_dissect_GROUP_MEMBERSHIP_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_GROUP_MEMBERSHIP); @@ -866,7 +866,7 @@ netlogon_dissect_GROUP_MEMBERSHIP_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_USER_SESSION_KEY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -914,7 +914,7 @@ netlogon_dissect_USER_SESSION_KEY(tvbuff_t *tvb, int offset, static int netlogon_dissect_VALIDATION_SAM_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { int i; @@ -1031,7 +1031,7 @@ netlogon_dissect_VALIDATION_SAM_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_VALIDATION_SAM_INFO2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { int i; @@ -1125,7 +1125,7 @@ netlogon_dissect_VALIDATION_SAM_INFO2(tvbuff_t *tvb, int offset, static int netlogon_dissect_PAC(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; guint32 pac_size; @@ -1149,7 +1149,7 @@ netlogon_dissect_PAC(tvbuff_t *tvb, int offset, static int netlogon_dissect_AUTH(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; guint32 auth_size; @@ -1191,7 +1191,7 @@ netlogon_dissect_AUTH(tvbuff_t *tvb, int offset, static int netlogon_dissect_VALIDATION_PAC_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { int i; @@ -1251,7 +1251,7 @@ netlogon_dissect_VALIDATION_PAC_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_VALIDATION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -1301,7 +1301,7 @@ netlogon_dissect_VALIDATION(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogonsamlogon_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -1333,7 +1333,7 @@ netlogon_dissect_netrlogonsamlogon_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsamlogon_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_UNIQUE, @@ -1365,7 +1365,7 @@ netlogon_dissect_netrlogonsamlogon_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogonsamlogoff_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -1393,7 +1393,7 @@ netlogon_dissect_netrlogonsamlogoff_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrlogonsamlogoff_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, @@ -1417,7 +1417,7 @@ netlogon_dissect_netrlogonsamlogoff_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -1437,7 +1437,7 @@ netlogon_dissect_netrserverreqchallenge_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrserverreqchallenge_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CREDENTIAL, NDR_POINTER_REF, @@ -1453,7 +1453,7 @@ netlogon_dissect_netrserverreqchallenge_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_NETLOGON_SECURE_CHANNEL_TYPE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep, hf_netlogon_secure_channel_type, NULL); @@ -1474,7 +1474,7 @@ netlogon_dissect_NETLOGON_SECURE_CHANNEL_TYPE(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrserverauthenticate_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -1496,7 +1496,7 @@ netlogon_dissect_netrserverauthenticate_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrserverauthenticate_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CREDENTIAL, NDR_POINTER_REF, @@ -1518,7 +1518,7 @@ netlogon_dissect_netrserverauthenticate_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_ENCRYPTED_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -1548,7 +1548,7 @@ netlogon_dissect_ENCRYPTED_LM_OWF_PASSWORD(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrserverpasswordset_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -1574,7 +1574,7 @@ netlogon_dissect_netrserverpasswordset_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrserverpasswordset_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -1603,7 +1603,7 @@ netlogon_dissect_netrserverpasswordset_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_DELETE_USER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Account Name", hf_netlogon_acct_name, 0); @@ -1646,7 +1646,7 @@ netlogon_dissect_DELTA_DELETE_USER(tvbuff_t *tvb, int offset, static int netlogon_dissect_SENSITIVE_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; guint32 data_len; @@ -1669,7 +1669,7 @@ netlogon_dissect_SENSITIVE_DATA(tvbuff_t *tvb, int offset, static int netlogon_dissect_USER_PRIVATE_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_sensitive_data_flag, NULL); @@ -1728,7 +1728,7 @@ netlogon_dissect_USER_PRIVATE_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_acct_name, 3); @@ -1869,7 +1869,7 @@ netlogon_dissect_DELTA_USER(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_DOMAIN(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_domain_name, 3); @@ -1952,7 +1952,7 @@ netlogon_dissect_DELTA_DOMAIN(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_GROUP(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_group_name, 3); @@ -2014,7 +2014,7 @@ netlogon_dissect_DELTA_GROUP(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_RENAME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -2057,7 +2057,7 @@ netlogon_dissect_DELTA_RENAME(tvbuff_t *tvb, int offset, static int netlogon_dissect_RID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_user_rid, NULL); @@ -2068,7 +2068,7 @@ netlogon_dissect_RID(tvbuff_t *tvb, int offset, static int netlogon_dissect_RID_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_RID); @@ -2079,7 +2079,7 @@ netlogon_dissect_RID_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_ATTRIB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_attrs, NULL); @@ -2090,7 +2090,7 @@ netlogon_dissect_ATTRIB(tvbuff_t *tvb, int offset, static int netlogon_dissect_ATTRIB_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_ATTRIB); @@ -2112,7 +2112,7 @@ netlogon_dissect_ATTRIB_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_GROUP_MEMBER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_RID_array, NDR_POINTER_UNIQUE, @@ -2160,7 +2160,7 @@ netlogon_dissect_DELTA_GROUP_MEMBER(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ALIAS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_alias_name, 0); @@ -2214,7 +2214,7 @@ netlogon_dissect_DELTA_ALIAS(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ALIAS_MEMBER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_nt_PSID_ARRAY(tvb, offset, pinfo, tree, drep); @@ -2237,7 +2237,7 @@ netlogon_dissect_DELTA_ALIAS_MEMBER(tvbuff_t *tvb, int offset, static int netlogon_dissect_EVENT_AUDIT_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_event_audit_option, NULL); @@ -2248,7 +2248,7 @@ netlogon_dissect_EVENT_AUDIT_OPTION(tvbuff_t *tvb, int offset, static int netlogon_dissect_EVENT_AUDIT_OPTIONS_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_EVENT_AUDIT_OPTION); @@ -2270,7 +2270,7 @@ netlogon_dissect_EVENT_AUDIT_OPTIONS_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_QUOTA_LIMITS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2332,7 +2332,7 @@ netlogon_dissect_QUOTA_LIMITS(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_POLICY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_max_log_size, NULL); @@ -2402,7 +2402,7 @@ netlogon_dissect_DELTA_POLICY(tvbuff_t *tvb, int offset, static int netlogon_dissect_CONTROLLER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_dc_name, 0); @@ -2413,7 +2413,7 @@ netlogon_dissect_CONTROLLER(tvbuff_t *tvb, int offset, static int netlogon_dissect_CONTROLLER_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_CONTROLLER); @@ -2442,7 +2442,7 @@ netlogon_dissect_CONTROLLER_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_TRUSTED_DOMAINS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_domain_name, 0); @@ -2491,7 +2491,7 @@ netlogon_dissect_DELTA_TRUSTED_DOMAINS(tvbuff_t *tvb, int offset, static int netlogon_dissect_PRIV_ATTR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_attrs, NULL); @@ -2502,7 +2502,7 @@ netlogon_dissect_PRIV_ATTR(tvbuff_t *tvb, int offset, static int netlogon_dissect_PRIV_ATTR_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_PRIV_ATTR); @@ -2513,7 +2513,7 @@ netlogon_dissect_PRIV_ATTR_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_PRIV_NAME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_netlogon_privilege_name, 1); @@ -2524,7 +2524,7 @@ netlogon_dissect_PRIV_NAME(tvbuff_t *tvb, int offset, static int netlogon_dissect_PRIV_NAME_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_PRIV_NAME); @@ -2556,7 +2556,7 @@ netlogon_dissect_PRIV_NAME_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ACCOUNTS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_privilege_entries, NULL); @@ -2621,7 +2621,7 @@ netlogon_dissect_DELTA_ACCOUNTS(tvbuff_t *tvb, int offset, static int netlogon_dissect_CIPHER_VALUE_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; guint32 data_len; @@ -2650,7 +2650,7 @@ netlogon_dissect_CIPHER_VALUE_DATA(tvbuff_t *tvb, int offset, static int netlogon_dissect_CIPHER_VALUE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep, char *name, int hf_index) + guint8 *drep, char *name, int hf_index) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2697,7 +2697,7 @@ netlogon_dissect_CIPHER_VALUE(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_SECRET(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = netlogon_dissect_CIPHER_VALUE(tvb, offset, pinfo, tree, drep, @@ -2757,7 +2757,7 @@ netlogon_dissect_DELTA_SECRET(tvbuff_t *tvb, int offset, static int netlogon_dissect_MODIFIED_COUNT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint64(tvb, offset, pinfo, tree, drep, hf_netlogon_modify_count, NULL); @@ -2824,7 +2824,7 @@ static const value_string delta_type_vals[] = { static int netlogon_dissect_DELTA_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2958,7 +2958,7 @@ netlogon_dissect_DELTA_UNION(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ID_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3078,7 +3078,7 @@ netlogon_dissect_DELTA_ID_UNION(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ENUM(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3110,7 +3110,7 @@ netlogon_dissect_DELTA_ENUM(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ENUM_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_DELTA_ENUM); @@ -3127,7 +3127,7 @@ netlogon_dissect_DELTA_ENUM_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_DELTA_ENUM_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_num_deltas, NULL); @@ -3154,7 +3154,7 @@ netlogon_dissect_DELTA_ENUM_ARRAY(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrdatabasedeltas_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_REF, "Server Handle", hf_netlogon_logonsrv_handle, 0); @@ -3184,7 +3184,7 @@ netlogon_dissect_netrdatabasedeltas_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrdatabasedeltas_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -3219,7 +3219,7 @@ netlogon_dissect_netrdatabasedeltas_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrdatabasesync_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_REF, "Server Handle", hf_netlogon_logonsrv_handle, 0); @@ -3250,7 +3250,7 @@ netlogon_dissect_netrdatabasesync_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrdatabasesync_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -3279,7 +3279,7 @@ netlogon_dissect_netrdatabasesync_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_UAS_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -3305,7 +3305,7 @@ netlogon_dissect_UAS_INFO_0(tvbuff_t *tvb, int offset, static int netlogon_dissect_BYTE_byte(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_char, NULL); @@ -3316,7 +3316,7 @@ netlogon_dissect_BYTE_byte(tvbuff_t *tvb, int offset, static int netlogon_dissect_BYTE_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_BYTE_byte); @@ -3341,7 +3341,7 @@ netlogon_dissect_BYTE_array(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netraccountdeltas_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -3374,7 +3374,7 @@ netlogon_dissect_netraccountdeltas_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netraccountdeltas_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -3419,7 +3419,7 @@ netlogon_dissect_netraccountdeltas_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netraccountsync_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -3448,7 +3448,7 @@ netlogon_dissect_netraccountsync_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netraccountsync_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -3487,7 +3487,7 @@ netlogon_dissect_netraccountsync_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrgetdcname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_REF, "Server Handle", hf_netlogon_logonsrv_handle, 0); @@ -3499,7 +3499,7 @@ netlogon_dissect_netrgetdcname_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrgetdcname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Domain", hf_netlogon_dc_name, 0); @@ -3521,7 +3521,7 @@ netlogon_dissect_netrgetdcname_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_NETLOGON_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_flags, NULL); @@ -3544,7 +3544,7 @@ netlogon_dissect_NETLOGON_INFO_1(tvbuff_t *tvb, int offset, static int netlogon_dissect_NETLOGON_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_flags, NULL); @@ -3577,7 +3577,7 @@ netlogon_dissect_NETLOGON_INFO_2(tvbuff_t *tvb, int offset, static int netlogon_dissect_NETLOGON_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_flags, NULL); @@ -3614,7 +3614,7 @@ netlogon_dissect_NETLOGON_INFO_3(tvbuff_t *tvb, int offset, static int netlogon_dissect_CONTROL_QUERY_INFORMATION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -3654,7 +3654,7 @@ netlogon_dissect_CONTROL_QUERY_INFORMATION(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogoncontrol_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -3669,7 +3669,7 @@ netlogon_dissect_netrlogoncontrol_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrlogoncontrol_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CONTROL_QUERY_INFORMATION, NDR_POINTER_REF, @@ -3691,7 +3691,7 @@ netlogon_dissect_netrlogoncontrol_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrgetanydcname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server Handle", @@ -3704,7 +3704,7 @@ netlogon_dissect_netrgetanydcname_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrgetanydcname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Domain", hf_netlogon_dc_name, 0); @@ -3734,7 +3734,7 @@ netlogon_dissect_netrgetanydcname_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_CONTROL_DATA_INFORMATION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -3779,7 +3779,7 @@ netlogon_dissect_CONTROL_DATA_INFORMATION(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogoncontrol2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -3799,7 +3799,7 @@ netlogon_dissect_netrlogoncontrol2_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogoncontrol2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CONTROL_QUERY_INFORMATION, NDR_POINTER_REF, @@ -3825,7 +3825,7 @@ netlogon_dissect_netrlogoncontrol2_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrserverauthenticate2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -3854,7 +3854,7 @@ netlogon_dissect_netrserverauthenticate2_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverauthenticate2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CREDENTIAL, NDR_POINTER_REF, @@ -3885,7 +3885,7 @@ netlogon_dissect_netrserverauthenticate2_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrdatabasesync2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_REF, "Server Handle", hf_netlogon_logonsrv_handle, 0); @@ -3918,7 +3918,7 @@ netlogon_dissect_netrdatabasesync2_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrdatabasesync2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -3951,7 +3951,7 @@ netlogon_dissect_netrdatabasesync2_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrdatabaseredo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_REF, "Server Handle", hf_netlogon_logonsrv_handle, 0); @@ -3979,7 +3979,7 @@ netlogon_dissect_netrdatabaseredo_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrdatabaseredo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -4007,7 +4007,7 @@ netlogon_dissect_netrdatabaseredo_reply(tvbuff_t *tvb, int offset, */ static int netlogon_dissect_netrlogoncontrol2ex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -4026,7 +4026,7 @@ netlogon_dissect_netrlogoncontrol2ex_rqst(tvbuff_t *tvb, int offset, } static int netlogon_dissect_netrlogoncontrol2ex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CONTROL_QUERY_INFORMATION, NDR_POINTER_REF, @@ -4090,7 +4090,7 @@ static const true_false_string trust_tree_root = { }; static int netlogon_dissect_DOMAIN_TRUST_FLAGS(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { guint32 mask; proto_item *item = NULL; @@ -4216,7 +4216,7 @@ static const true_false_string get_dcname_request_flags_return_flat_name = { }; static int netlogon_dissect_GET_DCNAME_REQUEST_FLAGS(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { guint32 mask; proto_item *item = NULL; @@ -4345,7 +4345,7 @@ static const true_false_string dc_flags_dns_forest_flag = { }; static int netlogon_dissect_DC_FLAGS(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { guint32 mask; proto_item *item = NULL; @@ -4402,7 +4402,7 @@ netlogon_dissect_DC_FLAGS(tvbuff_t *tvb, int offset, static int netlogon_dissect_pointer_long(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -4415,7 +4415,7 @@ netlogon_dissect_pointer_long(tvbuff_t *tvb, int offset, static int netlogon_dissect_pointer_char(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -4428,7 +4428,7 @@ netlogon_dissect_pointer_char(tvbuff_t *tvb, int offset, static int netlogon_dissect_UNICODE_MULTI_byte(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_char, NULL); @@ -4439,7 +4439,7 @@ netlogon_dissect_UNICODE_MULTI_byte(tvbuff_t *tvb, int offset, static int netlogon_dissect_UNICODE_MULTI_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_UNICODE_MULTI_byte); @@ -4450,7 +4450,7 @@ netlogon_dissect_UNICODE_MULTI_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_UNICODE_MULTI(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4476,7 +4476,7 @@ netlogon_dissect_UNICODE_MULTI(tvbuff_t *tvb, int offset, int dissect_nt_GUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset=dissect_ndr_uuid_t(tvb, offset, pinfo, tree, drep, hf_netlogon_guid, NULL); @@ -4486,7 +4486,7 @@ dissect_nt_GUID(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_CONTROLLER_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4532,7 +4532,7 @@ netlogon_dissect_DOMAIN_CONTROLLER_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_BLOB_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -4556,7 +4556,7 @@ netlogon_dissect_BLOB_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_BLOB(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4580,7 +4580,7 @@ netlogon_dissect_BLOB(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_TRUST_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4627,7 +4627,7 @@ netlogon_dissect_DOMAIN_TRUST_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_TRUST_INFO_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_DOMAIN_TRUST_INFO); @@ -4638,7 +4638,7 @@ netlogon_dissect_DOMAIN_TRUST_INFO_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_QUERY_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = netlogon_dissect_BLOB(tvb, offset, pinfo, tree, drep); @@ -4693,7 +4693,7 @@ netlogon_dissect_DOMAIN_QUERY_1(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = netlogon_dissect_DOMAIN_TRUST_INFO(tvb, offset, pinfo, tree, drep); @@ -4743,7 +4743,7 @@ netlogon_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -4765,7 +4765,7 @@ netlogon_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, static int netlogon_dissect_UNICODE_STRING_512(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4793,7 +4793,7 @@ netlogon_dissect_UNICODE_STRING_512(tvbuff_t *tvb, int offset, static int netlogon_dissect_element_844_byte(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_char, NULL); @@ -4804,7 +4804,7 @@ netlogon_dissect_element_844_byte(tvbuff_t *tvb, int offset, static int netlogon_dissect_element_844_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_844_byte); @@ -4815,7 +4815,7 @@ netlogon_dissect_element_844_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_TYPE_50(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4841,7 +4841,7 @@ netlogon_dissect_TYPE_50(tvbuff_t *tvb, int offset, static int netlogon_dissect_TYPE_50_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_TYPE_50, NDR_POINTER_UNIQUE, @@ -4852,7 +4852,7 @@ netlogon_dissect_TYPE_50_ptr(tvbuff_t *tvb, int offset, static int netlogon_dissect_DS_DOMAIN_TRUSTS(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *parent_tree, char *drep) + packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { guint32 tmp; proto_item *item=NULL; @@ -4899,7 +4899,7 @@ netlogon_dissect_DS_DOMAIN_TRUSTS(tvbuff_t *tvb, int offset, static int netlogon_dissect_DS_DOMAIN_TRUSTS_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_DS_DOMAIN_TRUSTS); @@ -4910,7 +4910,7 @@ netlogon_dissect_DS_DOMAIN_TRUSTS_ARRAY(tvbuff_t *tvb, int offset, static int netlogon_dissect_element_865_byte(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_char, NULL); @@ -4921,7 +4921,7 @@ netlogon_dissect_element_865_byte(tvbuff_t *tvb, int offset, static int netlogon_dissect_element_865_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_865_byte); @@ -4932,7 +4932,7 @@ netlogon_dissect_element_865_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_element_866_byte(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_netlogon_unknown_char, NULL); @@ -4943,7 +4943,7 @@ netlogon_dissect_element_866_byte(tvbuff_t *tvb, int offset, static int netlogon_dissect_element_866_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_element_866_byte); @@ -4954,7 +4954,7 @@ netlogon_dissect_element_866_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_TYPE_52(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4984,7 +4984,7 @@ netlogon_dissect_TYPE_52(tvbuff_t *tvb, int offset, static int netlogon_dissect_TYPE_52_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_TYPE_52, NDR_POINTER_UNIQUE, @@ -4996,7 +4996,7 @@ netlogon_dissect_TYPE_52_ptr(tvbuff_t *tvb, int offset, static int netlogon_dissect_TYPE_44(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -5027,7 +5027,7 @@ netlogon_dissect_TYPE_44(tvbuff_t *tvb, int offset, static int netlogon_dissect_DOMAIN_QUERY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -5053,7 +5053,7 @@ netlogon_dissect_DOMAIN_QUERY(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrenumeratetrusteddomains_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5064,7 +5064,7 @@ netlogon_dissect_netrenumeratetrusteddomains_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrenumeratetrusteddomains_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_UNICODE_MULTI, NDR_POINTER_REF, @@ -5078,7 +5078,7 @@ netlogon_dissect_netrenumeratetrusteddomains_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcname_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5103,7 +5103,7 @@ netlogon_dissect_dsrgetdcname_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcname_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_DOMAIN_CONTROLLER_INFO, NDR_POINTER_UNIQUE, @@ -5117,7 +5117,7 @@ netlogon_dissect_dsrgetdcname_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogondummyroutine1_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5143,7 +5143,7 @@ netlogon_dissect_netrlogondummyroutine1_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogondummyroutine1_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_UNIQUE, @@ -5161,7 +5161,7 @@ netlogon_dissect_netrlogondummyroutine1_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsetservicebits_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5178,7 +5178,7 @@ netlogon_dissect_netrlogonsetservicebits_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsetservicebits_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_netlogon_rc, NULL); @@ -5189,7 +5189,7 @@ netlogon_dissect_netrlogonsetservicebits_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogongettrustrid_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5204,7 +5204,7 @@ netlogon_dissect_netrlogongettrustrid_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogongettrustrid_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_pointer_long, NDR_POINTER_UNIQUE, @@ -5219,7 +5219,7 @@ netlogon_dissect_netrlogongettrustrid_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogoncomputeserverdigest_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5239,7 +5239,7 @@ netlogon_dissect_netrlogoncomputeserverdigest_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_BYTE_16_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { int i; @@ -5253,7 +5253,7 @@ netlogon_dissect_BYTE_16_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogoncomputeserverdigest_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_BYTE_16_array, NDR_POINTER_UNIQUE, @@ -5267,7 +5267,7 @@ netlogon_dissect_netrlogoncomputeserverdigest_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogoncomputeclientdigest_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5289,7 +5289,7 @@ netlogon_dissect_netrlogoncomputeclientdigest_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogoncomputeclientdigest_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_BYTE_16_array, NDR_POINTER_UNIQUE, @@ -5303,7 +5303,7 @@ netlogon_dissect_netrlogoncomputeclientdigest_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverauthenticate3_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5330,7 +5330,7 @@ netlogon_dissect_netrserverauthenticate3_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverauthenticate3_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_CREDENTIAL, NDR_POINTER_REF, @@ -5351,7 +5351,7 @@ netlogon_dissect_netrserverauthenticate3_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcnameex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5374,7 +5374,7 @@ netlogon_dissect_dsrgetdcnameex_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcnameex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_DOMAIN_CONTROLLER_INFO, NDR_POINTER_UNIQUE, @@ -5388,7 +5388,7 @@ netlogon_dissect_dsrgetdcnameex_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetsitename_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5399,7 +5399,7 @@ netlogon_dissect_dsrgetsitename_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetsitename_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* XXX hmmm this does not really look like a UNIQUE pointer but @@ -5418,7 +5418,7 @@ netlogon_dissect_dsrgetsitename_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogongetdomaininfo_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { /* Unlike the other NETLOGON RPCs, this is not a unique pointer. */ offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, @@ -5449,7 +5449,7 @@ netlogon_dissect_netrlogongetdomaininfo_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogongetdomaininfo_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -5467,7 +5467,7 @@ netlogon_dissect_netrlogongetdomaininfo_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverpasswordset2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5496,7 +5496,7 @@ netlogon_dissect_netrserverpasswordset2_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverpasswordset2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_UNIQUE, @@ -5510,7 +5510,7 @@ netlogon_dissect_netrserverpasswordset2_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverpasswordget_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5535,7 +5535,7 @@ netlogon_dissect_netrserverpasswordget_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrserverpasswordget_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_REF, @@ -5553,7 +5553,7 @@ netlogon_dissect_netrserverpasswordget_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsendtosam_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5579,7 +5579,7 @@ netlogon_dissect_netrlogonsendtosam_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsendtosam_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_AUTHENTICATOR, NDR_POINTER_UNIQUE, @@ -5593,7 +5593,7 @@ netlogon_dissect_netrlogonsendtosam_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsraddresstositenamesw_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5611,7 +5611,7 @@ netlogon_dissect_dsraddresstositenamesw_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsraddresstositenamesw_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_TYPE_50_ptr, NDR_POINTER_UNIQUE, @@ -5625,7 +5625,7 @@ netlogon_dissect_dsraddresstositenamesw_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcnameex2_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5658,7 +5658,7 @@ netlogon_dissect_dsrgetdcnameex2_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcnameex2_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_DOMAIN_CONTROLLER_INFO, NDR_POINTER_UNIQUE, @@ -5672,7 +5672,7 @@ netlogon_dissect_dsrgetdcnameex2_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogongettimeserviceparentdomain_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5683,7 +5683,7 @@ netlogon_dissect_netrlogongettimeserviceparentdomain_rqst(tvbuff_t *tvb, int off static int netlogon_dissect_netrlogongettimeserviceparentdomain_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -5701,7 +5701,7 @@ netlogon_dissect_netrlogongettimeserviceparentdomain_reply(tvbuff_t *tvb, int of static int netlogon_dissect_netrenumeratetrusteddomainsex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5711,7 +5711,7 @@ netlogon_dissect_netrenumeratetrusteddomainsex_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrenumeratetrusteddomainsex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_entries, NULL); @@ -5728,7 +5728,7 @@ netlogon_dissect_netrenumeratetrusteddomainsex_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsraddresstositenamesexw_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5746,7 +5746,7 @@ netlogon_dissect_dsraddresstositenamesexw_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsraddresstositenamesexw_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_TYPE_52_ptr, NDR_POINTER_UNIQUE, @@ -5761,7 +5761,7 @@ netlogon_dissect_dsraddresstositenamesexw_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_site_name_item(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_counted_string_cb( tvb, offset, pinfo, tree, drep, hf_netlogon_site_name, @@ -5772,7 +5772,7 @@ netlogon_dissect_site_name_item(tvbuff_t *tvb, int offset, } static int netlogon_dissect_site_name_array(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, netlogon_dissect_site_name_item); @@ -5782,7 +5782,7 @@ netlogon_dissect_site_name_array(tvbuff_t *tvb, int offset, static int netlogon_dissect_site_names(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_count, NULL); @@ -5796,7 +5796,7 @@ netlogon_dissect_site_names(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcsitecoveragew_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5807,7 +5807,7 @@ netlogon_dissect_dsrgetdcsitecoveragew_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrgetdcsitecoveragew_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_site_names, NDR_POINTER_UNIQUE, @@ -5821,7 +5821,7 @@ netlogon_dissect_dsrgetdcsitecoveragew_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsamlogonex_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "unknown string", @@ -5850,7 +5850,7 @@ netlogon_dissect_netrlogonsamlogonex_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_netrlogonsamlogonex_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, netlogon_dissect_VALIDATION, NDR_POINTER_UNIQUE, @@ -5873,7 +5873,7 @@ netlogon_dissect_netrlogonsamlogonex_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrenumeratedomaintrusts_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5886,7 +5886,7 @@ netlogon_dissect_dsrenumeratedomaintrusts_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrenumeratedomaintrusts_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_netlogon_entries, NULL); @@ -5903,7 +5903,7 @@ netlogon_dissect_dsrenumeratedomaintrusts_reply(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrderegisterdnshostrecords_rqst(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = netlogon_dissect_LOGONSRV_HANDLE(tvb, offset, pinfo, tree, drep); @@ -5928,7 +5928,7 @@ netlogon_dissect_dsrderegisterdnshostrecords_rqst(tvbuff_t *tvb, int offset, static int netlogon_dissect_dsrderegisterdnshostrecords_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_netlogon_rc, NULL); @@ -5952,7 +5952,7 @@ static gint ett_secchan_bind_ack_creds = -1; static int dissect_secchan_bind_creds(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item = NULL; proto_tree *subtree = NULL; @@ -5997,7 +5997,7 @@ static int dissect_secchan_bind_creds(tvbuff_t *tvb, int offset, static int dissect_secchan_bind_ack_creds(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item = NULL; proto_tree *subtree = NULL; @@ -6178,7 +6178,7 @@ static int hf_netlogon_secchan_verf_nonce = -1; static int dissect_secchan_verf(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { proto_item *vf = NULL; proto_tree *subtree = NULL; diff --git a/packet-dcerpc-nt.c b/packet-dcerpc-nt.c index 6ef7e50136..8f79dded7d 100644 --- a/packet-dcerpc-nt.c +++ b/packet-dcerpc-nt.c @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001-2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.c,v 1.77 2003/07/01 00:59:43 guy Exp $ + * $Id: packet-dcerpc-nt.c,v 1.78 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -63,7 +63,7 @@ static int hf_nt_cs_size = -1; int dissect_ndr_counted_string_cb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index, + guint8 *drep, int hf_index, dcerpc_callback_fnct_t *callback, void *callback_args) { @@ -104,7 +104,7 @@ static gint ett_nt_counted_string = -1; static int dissect_ndr_counted_string_helper(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index, int levels, + guint8 *drep, int hf_index, int levels, gboolean add_subtree) { proto_item *item; @@ -134,7 +134,7 @@ dissect_ndr_counted_string_helper(tvbuff_t *tvb, int offset, int dissect_ndr_counted_string(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index, int levels) + guint8 *drep, int hf_index, int levels) { return dissect_ndr_counted_string_helper( tvb, offset, pinfo, tree, drep, hf_index, levels, TRUE); @@ -147,7 +147,7 @@ dissect_ndr_counted_string(tvbuff_t *tvb, int offset, int dissect_ndr_counted_string_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = pinfo->private_data; @@ -164,7 +164,7 @@ static gint ett_nt_counted_byte_array = -1; int dissect_ndr_counted_byte_array_cb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index, + guint8 *drep, int hf_index, dcerpc_callback_fnct_t *callback, void *callback_args) { @@ -210,7 +210,7 @@ dissect_ndr_counted_byte_array_cb(tvbuff_t *tvb, int offset, int dissect_ndr_counted_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index) + guint8 *drep, int hf_index) { return dissect_ndr_counted_byte_array_cb( tvb, offset, pinfo, tree, drep, hf_index, NULL, NULL); @@ -223,7 +223,7 @@ dissect_ndr_counted_byte_array(tvbuff_t *tvb, int offset, int dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_, int hf_index) + guint8 *drep _U_, int hf_index) { dcerpc_info *di; @@ -659,7 +659,7 @@ static void init_pol_hash(void) int dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata) { guint32 status; @@ -681,7 +681,7 @@ dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata) { guint32 status; @@ -708,7 +708,7 @@ static gint ett_nt_policy_hnd = -1; int dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, guint8 *drep, int hfindex, e_ctx_hnd *pdata, proto_item **pitem, gboolean is_open, gboolean is_close) { @@ -789,7 +789,7 @@ dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_dcerpc_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, guint8 *drep, int hfindex, int length, const guint8 **pdata) { const guint8 *data; @@ -808,7 +808,7 @@ dissect_dcerpc_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, int length, const guint8 **pdata) { dcerpc_info *di; @@ -826,7 +826,7 @@ dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_dcerpc_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, guint8 *drep, int hfindex, int length) { if (tree) { @@ -838,7 +838,7 @@ dissect_dcerpc_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, int length) { dcerpc_info *di; @@ -1000,7 +1000,7 @@ void cb_str_postprocess(packet_info *pinfo, proto_tree *tree _U_, int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, - char *drep, int type, char *text, + guint8 *drep, int type, char *text, int hf_index, int levels) { return dissect_ndr_pointer_cb( diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h index 4b0ca6604d..2506739cea 100644 --- a/packet-dcerpc-nt.h +++ b/packet-dcerpc-nt.h @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001-2003 Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.h,v 1.48 2003/06/17 05:29:46 tpot Exp $ + * $Id: packet-dcerpc-nt.h,v 1.49 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,64 +51,64 @@ extern const value_string platform_id_vals[]; int dissect_ndr_counted_string_cb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index, + guint8 *drep, int hf_index, dcerpc_callback_fnct_t *callback, void *callback_args); int dissect_ndr_counted_string_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); int dissect_ndr_counted_string(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep, int hf_index, int levels); + guint8 *drep, int hf_index, int levels); int dissect_ndr_counted_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep, int hf_index); + guint8 *drep, int hf_index); int dissect_ndr_counted_byte_array_cb(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index, + guint8 *drep, int hf_index, dcerpc_callback_fnct_t *callback, void *callback_args); int dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep); + proto_tree *parent_tree, guint8 *drep); int dissect_ndr_nt_NTTIME (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_index); + guint8 *drep, int hf_index); int dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); int dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep, int hf_sid); + guint8 *drep, int hf_sid); int dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep, int hf_sid); + guint8 *drep, int hf_sid); int dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); int dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); int dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); /* * Policy handle hashing @@ -137,52 +137,52 @@ dcerpc_smb_fetch_pol(e_ctx_hnd *policy_hnd, char **name, int dissect_ntstatus(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata); int dissect_doserror(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata); int dissect_nt_policy_hnd(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, guint8 *drep, int hfindex, e_ctx_hnd *pdata, proto_item **pitem, gboolean is_open, gboolean is_close); int dissect_nt_GUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep); + guint8 *drep); int dissect_nt_LUID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep); + guint8 *drep); /* Stored here instead of packet-dcerpc{,-ndr}.c as they are probably not official NDR representations. */ int dissect_dcerpc_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, int length, const guint8 **pdata); int dissect_ndr_uint8s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, int length, const guint8 **pdata); int dissect_dcerpc_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, int length); int dissect_ndr_uint16s(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, int length); int dissect_ndr_str_pointer_item(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, - char *drep, int type, char *text, + guint8 *drep, int type, char *text, int hf_index, int levels); /* diff --git a/packet-dcerpc-oxid.c b/packet-dcerpc-oxid.c index c380a2ad33..7381784bc1 100644 --- a/packet-dcerpc-oxid.c +++ b/packet-dcerpc-oxid.c @@ -2,7 +2,7 @@ * Routines for DCOM OXID Resolver * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc-oxid.c,v 1.10 2003/10/12 16:03:10 sharpe Exp $ + * $Id: packet-dcerpc-oxid.c,v 1.11 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -157,7 +157,7 @@ towerid_val2str(unsigned short tower) { static int oxid_server_alive2_dissect_rply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) { + proto_tree *tree, guint8 *drep) { COMVERSION comver; DUALSTRINGARRAY stringarray; STRINGBINDING stringbind; diff --git a/packet-dcerpc-reg.c b/packet-dcerpc-reg.c index bbfd1c9b72..75370a3a36 100644 --- a/packet-dcerpc-reg.c +++ b/packet-dcerpc-reg.c @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\winreg packet disassembly * Copyright 2001-2003 Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-reg.c,v 1.23 2003/10/24 00:35:29 guy Exp $ + * $Id: packet-dcerpc-reg.c,v 1.24 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -84,7 +84,7 @@ static int hf_shutdown_reason = -1; static int dissect_open_data(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint16( tvb, offset, pinfo, tree, drep, @@ -107,7 +107,7 @@ dissect_open_data(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenHKLM_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -121,7 +121,7 @@ RegOpenHKLM_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenHKLM_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -151,7 +151,7 @@ RegOpenHKLM_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenHKU_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -165,7 +165,7 @@ RegOpenHKU_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenHKU_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -195,7 +195,7 @@ RegOpenHKU_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenHKCR_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -209,7 +209,7 @@ RegOpenHKCR_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenHKCR_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -239,7 +239,7 @@ RegOpenHKCR_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegCloseKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -252,7 +252,7 @@ RegCloseKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegCloseKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -272,7 +272,7 @@ RegCloseKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegQueryInfoKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -288,7 +288,7 @@ RegQueryInfoKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegQueryInfoKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -338,7 +338,7 @@ RegQueryInfoKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -362,7 +362,7 @@ RegOpenKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegOpenKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -393,7 +393,7 @@ RegOpenKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegGetVersion_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -406,7 +406,7 @@ RegGetVersion_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegGetVersion_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -426,7 +426,7 @@ RegGetVersion_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegEnumKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -439,7 +439,7 @@ RegEnumKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegEnumKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -455,7 +455,7 @@ RegEnumKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_reserved(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, hf_reserved, NULL); @@ -465,7 +465,7 @@ dissect_reserved(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_offered(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, hf_offered, NULL); @@ -475,7 +475,7 @@ dissect_offered(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_returned(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, hf_returned, NULL); @@ -485,7 +485,7 @@ dissect_returned(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_unknown(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, hf_unknown, NULL); @@ -495,7 +495,7 @@ dissect_unknown(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegQueryValue_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -541,7 +541,7 @@ RegQueryValue_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_key_type(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, hf_keytype, NULL); @@ -551,7 +551,7 @@ dissect_key_type(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegQueryValue_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -584,7 +584,7 @@ RegQueryValue_r(tvbuff_t *tvb, int offset, packet_info *pinfo, /* Reg Shutdown functions */ static int dissect_shutdown_server(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint16( tvb, offset, pinfo, tree, drep, hf_shutdown_server, NULL); @@ -594,7 +594,7 @@ dissect_shutdown_server(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_shutdown_message(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_counted_string( tvb, offset, pinfo, tree, drep, hf_shutdown_message, 0); @@ -604,7 +604,7 @@ dissect_shutdown_message(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, @@ -629,7 +629,7 @@ RegShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegShutdown_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus( tvb, offset, pinfo, tree, drep, hf_rc, NULL); @@ -639,7 +639,7 @@ RegShutdown_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegAbortShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer( tvb, offset, pinfo, tree, drep, @@ -651,7 +651,7 @@ RegAbortShutdown_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegShutdownEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = RegShutdown_q(tvb, offset, pinfo, tree, drep); offset = dissect_ndr_uint32( @@ -670,7 +670,7 @@ RegShutdownEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -681,7 +681,7 @@ RegFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static int RegFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; diff --git a/packet-dcerpc-rpriv.c b/packet-dcerpc-rpriv.c index 5853788aee..a04bc7c6b1 100644 --- a/packet-dcerpc-rpriv.c +++ b/packet-dcerpc-rpriv.c @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rpriv.idl * - * $Id: packet-dcerpc-rpriv.c,v 1.8 2003/12/28 23:50:31 guy Exp $ + * $Id: packet-dcerpc-rpriv.c,v 1.9 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -62,7 +62,7 @@ static guint16 ver_rpriv = 1; static int rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* [in] handle_t handle, * [in] unsigned32 authn_svc, diff --git a/packet-dcerpc-rs_acct.c b/packet-dcerpc-rs_acct.c index b02a51a37a..fe815498ee 100644 --- a/packet-dcerpc-rs_acct.c +++ b/packet-dcerpc-rs_acct.c @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_acct.idl * - * $Id: packet-dcerpc-rs_acct.c,v 1.6 2003/12/21 05:51:33 jmayer Exp $ + * $Id: packet-dcerpc-rs_acct.c,v 1.7 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -62,7 +62,7 @@ static guint16 ver_rs_acct = 1; static int rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint32 key_size; const char *key_t = NULL; @@ -95,7 +95,7 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset, static int rs_acct_dissect_get_projlist_rqst (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint32 key_size; const char *key_t = NULL; diff --git a/packet-dcerpc-rs_misc.c b/packet-dcerpc-rs_misc.c index 7170b3374e..e469b43de2 100644 --- a/packet-dcerpc-rs_misc.c +++ b/packet-dcerpc-rs_misc.c @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_misc.idl * - * $Id: packet-dcerpc-rs_misc.c,v 1.6 2003/12/21 05:51:33 jmayer Exp $ + * $Id: packet-dcerpc-rs_misc.c,v 1.7 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -58,7 +58,7 @@ static guint16 ver_rs_misc = 1; static int rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset, - packet_info *pinfo, proto_tree *tree, char *drep) + packet_info *pinfo, proto_tree *tree, guint8 *drep) { guint32 key_size; diff --git a/packet-dcerpc-rs_pgo.c b/packet-dcerpc-rs_pgo.c index d68109a6d0..8f83e73d55 100644 --- a/packet-dcerpc-rs_pgo.c +++ b/packet-dcerpc-rs_pgo.c @@ -5,7 +5,7 @@ * This information is based off the released idl files from opengroup. * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_pgo.idl * - * $Id: packet-dcerpc-rs_pgo.c,v 1.5 2003/08/04 02:49:01 tpot Exp $ + * $Id: packet-dcerpc-rs_pgo.c,v 1.6 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -75,7 +75,7 @@ static guint16 ver_rs_pgo = 1; static int rs_pgo_dissect_get_members_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 name_domain, sec_rgy_name_max_len, sec_rgy_name_t_size; const char *sec_rgy_name_t = NULL; @@ -102,7 +102,7 @@ rs_pgo_dissect_get_members_rqst (tvbuff_t *tvb, int offset, static int rs_pgo_dissect_key_transfer_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 var1, var2, var3; @@ -122,7 +122,7 @@ rs_pgo_dissect_key_transfer_rqst (tvbuff_t *tvb, int offset, static int rs_pgo_dissect_is_member_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 var1, var2, key1_size, key2_size, var3; const char *key1, *key2; @@ -156,7 +156,7 @@ rs_pgo_dissect_is_member_rqst (tvbuff_t *tvb, int offset, static int rs_pgo_dissect_get_rqst (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 name_domain, key_size, var, var2; diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c index e1f912875c..b8b25c137b 100644 --- a/packet-dcerpc-samr.c +++ b/packet-dcerpc-samr.c @@ -3,7 +3,7 @@ * Copyright 2001,2003 Tim Potter <tpot@samba.org> * 2002 Added all command dissectors Ronnie Sahlberg * - * $Id: packet-dcerpc-samr.c,v 1.102 2003/09/29 00:01:26 tpot Exp $ + * $Id: packet-dcerpc-samr.c,v 1.103 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -473,7 +473,7 @@ struct access_mask_info samr_group_access_mask_info = { int dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hf_sid) + proto_tree *tree, guint8 *drep, int hf_sid) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -504,14 +504,14 @@ dissect_ndr_nt_SID(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int dissect_ndr_nt_SID_no_hf(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_nt_SID(tvb, offset, pinfo, tree, drep, -1); return offset; } static int dissect_ndr_nt_SID_hf_through_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; @@ -567,7 +567,7 @@ static const true_false_string tfs_nt_acb_autolock = { }; int dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep) + proto_tree *parent_tree, guint8 *drep) { guint32 mask; proto_item *item = NULL; @@ -615,7 +615,7 @@ dissect_ndr_nt_acct_ctrl(tvbuff_t *tvb, int offset, packet_info *pinfo, static int samr_dissect_open_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -641,7 +641,7 @@ samr_dissect_open_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, static int samr_dissect_open_user_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -678,7 +678,7 @@ samr_dissect_open_user_reply(tvbuff_t *tvb, int offset, static int samr_dissect_pointer_long(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -691,7 +691,7 @@ samr_dissect_pointer_long(tvbuff_t *tvb, int offset, static int samr_dissect_pointer_STRING(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -709,7 +709,7 @@ samr_dissect_pointer_STRING(tvbuff_t *tvb, int offset, static int samr_dissect_pointer_short(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -723,7 +723,7 @@ samr_dissect_pointer_short(tvbuff_t *tvb, int offset, static int samr_dissect_query_dispinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; guint32 start_idx; @@ -751,7 +751,7 @@ samr_dissect_query_dispinfo_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_USER_DISPINFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -782,7 +782,7 @@ samr_dissect_USER_DISPINFO_1(tvbuff_t *tvb, int offset, static int samr_dissect_USER_DISPINFO_1_ARRAY_users(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_USER_DISPINFO_1); @@ -793,7 +793,7 @@ samr_dissect_USER_DISPINFO_1_ARRAY_users(tvbuff_t *tvb, int offset, static int samr_dissect_USER_DISPINFO_1_ARRAY (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -822,7 +822,7 @@ samr_dissect_USER_DISPINFO_1_ARRAY (tvbuff_t *tvb, int offset, static int samr_dissect_USER_DISPINFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -851,7 +851,7 @@ samr_dissect_USER_DISPINFO_2(tvbuff_t *tvb, int offset, static int samr_dissect_USER_DISPINFO_2_ARRAY_users (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_USER_DISPINFO_2); @@ -862,7 +862,7 @@ samr_dissect_USER_DISPINFO_2_ARRAY_users (tvbuff_t *tvb, int offset, static int samr_dissect_USER_DISPINFO_2_ARRAY (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -889,7 +889,7 @@ samr_dissect_USER_DISPINFO_2_ARRAY (tvbuff_t *tvb, int offset, static int samr_dissect_GROUP_DISPINFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -919,7 +919,7 @@ samr_dissect_GROUP_DISPINFO(tvbuff_t *tvb, int offset, static int samr_dissect_GROUP_DISPINFO_ARRAY_groups(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_GROUP_DISPINFO); @@ -930,7 +930,7 @@ samr_dissect_GROUP_DISPINFO_ARRAY_groups(tvbuff_t *tvb, int offset, static int samr_dissect_GROUP_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -958,7 +958,7 @@ samr_dissect_GROUP_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_ASCII_DISPINFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -988,7 +988,7 @@ samr_dissect_ASCII_DISPINFO(tvbuff_t *tvb, int offset, static int samr_dissect_ASCII_DISPINFO_ARRAY_users(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_ASCII_DISPINFO); @@ -999,7 +999,7 @@ samr_dissect_ASCII_DISPINFO_ARRAY_users(tvbuff_t *tvb, int offset, static int samr_dissect_ASCII_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -1026,7 +1026,7 @@ samr_dissect_ASCII_DISPINFO_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_DISPLAY_INFO (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1071,7 +1071,7 @@ samr_dissect_DISPLAY_INFO (tvbuff_t *tvb, int offset, static int samr_dissect_query_dispinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_pointer_long, NDR_POINTER_REF, @@ -1092,7 +1092,7 @@ static int samr_dissect_get_display_enumeration_index_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -1114,7 +1114,7 @@ samr_dissect_get_display_enumeration_index_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_display_enumeration_index_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_pointer_long, NDR_POINTER_REF, @@ -1132,7 +1132,7 @@ samr_dissect_get_display_enumeration_index_reply(tvbuff_t *tvb, int offset, static int samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1159,7 +1159,7 @@ samr_dissect_PASSWORD_INFO(tvbuff_t *tvb, int offset, static int samr_dissect_get_usrdom_pwinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1170,7 +1170,7 @@ samr_dissect_get_usrdom_pwinfo_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_usrdom_pwinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_PASSWORD_INFO, NDR_POINTER_REF, @@ -1184,7 +1184,7 @@ samr_dissect_get_usrdom_pwinfo_reply(tvbuff_t *tvb, int offset, static int samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer_cb( tvb, offset, pinfo, tree, drep, @@ -1202,7 +1202,7 @@ samr_dissect_connect2_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer_cb( tvb, offset, pinfo, tree, drep, @@ -1223,7 +1223,7 @@ samr_dissect_connect4_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_connect2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -1259,7 +1259,7 @@ samr_dissect_connect2_reply(tvbuff_t *tvb, int offset, static int samr_dissect_connect_anon_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { char str[2]; guint16 server; @@ -1277,7 +1277,7 @@ samr_dissect_connect_anon_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_connect_anon_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -1304,7 +1304,7 @@ samr_dissect_connect_anon_reply(tvbuff_t *tvb, int offset, static int samr_dissect_USER_GROUP(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1328,7 +1328,7 @@ samr_dissect_USER_GROUP(tvbuff_t *tvb, int offset, static int samr_dissect_USER_GROUP_ARRAY_groups (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_USER_GROUP); @@ -1339,7 +1339,7 @@ samr_dissect_USER_GROUP_ARRAY_groups (tvbuff_t *tvb, int offset, static int samr_dissect_USER_GROUP_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -1365,7 +1365,7 @@ samr_dissect_USER_GROUP_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_USER_GROUP_ARRAY_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_USER_GROUP_ARRAY, NDR_POINTER_UNIQUE, @@ -1376,7 +1376,7 @@ samr_dissect_USER_GROUP_ARRAY_ptr(tvbuff_t *tvb, int offset, static int samr_dissect_get_groups_for_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1387,7 +1387,7 @@ samr_dissect_get_groups_for_user_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_groups_for_user_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_USER_GROUP_ARRAY_ptr, NDR_POINTER_REF, @@ -1415,7 +1415,7 @@ static void append_sid_col_info(packet_info *pinfo, proto_tree *tree _U_, static int samr_dissect_open_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1434,7 +1434,7 @@ samr_dissect_open_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_open_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -1472,7 +1472,7 @@ samr_dissect_open_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1488,7 +1488,7 @@ samr_dissect_context_handle_SID(tvbuff_t *tvb, int offset, static int samr_dissect_add_member_to_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1505,7 +1505,7 @@ samr_dissect_add_member_to_group_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_add_member_to_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -1516,7 +1516,7 @@ samr_dissect_add_member_to_group_reply(tvbuff_t *tvb, int offset, static int samr_dissect_get_boot_key_information_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1527,7 +1527,7 @@ samr_dissect_get_boot_key_information_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_boot_key_information_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_pointer_short, NDR_POINTER_REF, @@ -1541,7 +1541,7 @@ samr_dissect_get_boot_key_information_reply(tvbuff_t *tvb, int offset, static int samr_dissect_create_alias_in_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -1560,7 +1560,7 @@ samr_dissect_create_alias_in_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_create_alias_in_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -1589,7 +1589,7 @@ samr_dissect_create_alias_in_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint16 level; @@ -1608,7 +1608,7 @@ samr_dissect_query_information_alias_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_ALIAS_INFO_1 (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); @@ -1622,7 +1622,7 @@ samr_dissect_ALIAS_INFO_1 (tvbuff_t *tvb, int offset, static int samr_dissect_ALIAS_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -1659,7 +1659,7 @@ samr_dissect_ALIAS_INFO(tvbuff_t *tvb, int offset, static int samr_dissect_ALIAS_INFO_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_ALIAS_INFO, NDR_POINTER_UNIQUE, @@ -1670,7 +1670,7 @@ samr_dissect_ALIAS_INFO_ptr(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_ALIAS_INFO_ptr, NDR_POINTER_REF, @@ -1685,7 +1685,7 @@ samr_dissect_query_information_alias_reply(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -1707,7 +1707,7 @@ samr_dissect_set_information_alias_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_ALIAS_INFO_ptr, NDR_POINTER_REF, @@ -1721,7 +1721,7 @@ samr_dissect_set_information_alias_reply(tvbuff_t *tvb, int offset, static int samr_dissect_CRYPT_PASSWORD(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -1740,7 +1740,7 @@ samr_dissect_CRYPT_PASSWORD(tvbuff_t *tvb, int offset, static int samr_dissect_CRYPT_HASH(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -1761,7 +1761,7 @@ samr_dissect_CRYPT_HASH(tvbuff_t *tvb, int offset, static void samr_dissect_decrypted_NT_PASSCHANGE_BLOCK(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { guint32 new_password_len = 0; guint32 pseudorandom_len = 0; @@ -1826,7 +1826,7 @@ samr_dissect_decrypted_NT_PASSCHANGE_BLOCK(tvbuff_t *tvb, int offset, static int samr_dissect_NT_PASSCHANGE_BLOCK(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; size_t password_len; @@ -1906,7 +1906,7 @@ samr_dissect_NT_PASSCHANGE_BLOCK(tvbuff_t *tvb, int offset, static int samr_dissect_LM_PASSCHANGE_BLOCK(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -1929,7 +1929,7 @@ samr_dissect_LM_PASSCHANGE_BLOCK(tvbuff_t *tvb, int offset, static int samr_dissect_LM_VERIFIER(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -1953,7 +1953,7 @@ samr_dissect_LM_VERIFIER(tvbuff_t *tvb, int offset, static int samr_dissect_NT_VERIFIER(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di; @@ -1977,7 +1977,7 @@ samr_dissect_NT_VERIFIER(tvbuff_t *tvb, int offset, static int samr_dissect_oem_change_password_user2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2003,7 +2003,7 @@ samr_dissect_oem_change_password_user2_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_oem_change_password_user2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2014,7 +2014,7 @@ samr_dissect_oem_change_password_user2_reply(tvbuff_t *tvb, int offset, static int samr_dissect_unicode_change_password_user2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_PASSWORD_INFO, NDR_POINTER_REF, @@ -2047,7 +2047,7 @@ samr_dissect_unicode_change_password_user2_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_unicode_change_password_user2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2058,7 +2058,7 @@ samr_dissect_unicode_change_password_user2_reply(tvbuff_t *tvb, int offset, static int samr_dissect_set_boot_key_information_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2077,7 +2077,7 @@ samr_dissect_set_boot_key_information_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_boot_key_information_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2088,7 +2088,7 @@ samr_dissect_set_boot_key_information_reply(tvbuff_t *tvb, int offset, static int samr_dissect_create_user2_in_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2109,7 +2109,7 @@ samr_dissect_create_user2_in_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_create_user2_in_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -2143,7 +2143,7 @@ samr_dissect_create_user2_in_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_get_display_enumeration_index2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2159,7 +2159,7 @@ samr_dissect_get_display_enumeration_index2_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_display_enumeration_index2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_samr_index, NULL); @@ -2172,7 +2172,7 @@ samr_dissect_get_display_enumeration_index2_reply(tvbuff_t *tvb, int offset, static int samr_dissect_change_password_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2210,7 +2210,7 @@ samr_dissect_change_password_user_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_change_password_user_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2221,7 +2221,7 @@ samr_dissect_change_password_user_reply(tvbuff_t *tvb, int offset, static int samr_dissect_set_member_attributes_of_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2234,7 +2234,7 @@ samr_dissect_set_member_attributes_of_group_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_member_attributes_of_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2245,7 +2245,7 @@ samr_dissect_set_member_attributes_of_group_reply(tvbuff_t *tvb, int offset, static int samr_dissect_GROUP_INFO_1 (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); @@ -2261,7 +2261,7 @@ samr_dissect_GROUP_INFO_1 (tvbuff_t *tvb, int offset, static int samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2302,7 +2302,7 @@ samr_dissect_GROUP_INFO(tvbuff_t *tvb, int offset, static int samr_dissect_GROUP_INFO_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_GROUP_INFO, NDR_POINTER_UNIQUE, @@ -2313,7 +2313,7 @@ samr_dissect_GROUP_INFO_ptr(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2327,7 +2327,7 @@ samr_dissect_query_information_group_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_GROUP_INFO_ptr, NDR_POINTER_REF, @@ -2341,7 +2341,7 @@ samr_dissect_query_information_group_reply(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -2363,7 +2363,7 @@ samr_dissect_set_information_group_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2375,7 +2375,7 @@ static int samr_dissect_get_domain_password_information_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_PASSWORD_INFO, NDR_POINTER_REF, @@ -2391,7 +2391,7 @@ static int samr_dissect_get_domain_password_information_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_PASSWORD_INFO, NDR_POINTER_REF, @@ -2406,7 +2406,7 @@ samr_dissect_get_domain_password_information_reply(tvbuff_t *tvb, int offset, static int samr_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2437,7 +2437,7 @@ samr_dissect_DOMAIN_INFO_1(tvbuff_t *tvb, int offset, static int samr_dissect_DOMAIN_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2479,7 +2479,7 @@ samr_dissect_DOMAIN_INFO_2(tvbuff_t *tvb, int offset, static int samr_dissect_DOMAIN_INFO_8(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2503,7 +2503,7 @@ samr_dissect_DOMAIN_INFO_8(tvbuff_t *tvb, int offset, static int samr_dissect_REPLICATION_STATUS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2529,7 +2529,7 @@ samr_dissect_REPLICATION_STATUS(tvbuff_t *tvb, int offset, static int samr_dissect_DOMAIN_INFO_11(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2553,7 +2553,7 @@ samr_dissect_DOMAIN_INFO_11(tvbuff_t *tvb, int offset, static int samr_dissect_DOMAIN_INFO_13(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2580,7 +2580,7 @@ samr_dissect_DOMAIN_INFO_13(tvbuff_t *tvb, int offset, static int samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2659,7 +2659,7 @@ samr_dissect_DOMAIN_INFO(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -2680,7 +2680,7 @@ samr_dissect_set_information_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -2691,7 +2691,7 @@ samr_dissect_set_information_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_lookup_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2706,7 +2706,7 @@ samr_dissect_lookup_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_lookup_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_SID_no_hf, NDR_POINTER_UNIQUE, @@ -2720,7 +2720,7 @@ samr_dissect_lookup_domain_reply(tvbuff_t *tvb, int offset, int dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep, int hf_sid) + guint8 *drep, int hf_sid) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2742,7 +2742,7 @@ dissect_ndr_nt_PSID(tvbuff_t *tvb, int offset, static int dissect_ndr_nt_PSID_no_hf(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { offset=dissect_ndr_nt_PSID(tvb, offset, pinfo, parent_tree, drep, -1); return offset; @@ -2751,7 +2751,7 @@ dissect_ndr_nt_PSID_no_hf(tvbuff_t *tvb, int offset, static int dissect_ndr_nt_PSID_ARRAY_sids (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_PSID_no_hf); @@ -2763,7 +2763,7 @@ dissect_ndr_nt_PSID_ARRAY_sids (tvbuff_t *tvb, int offset, int dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -2790,7 +2790,7 @@ dissect_ndr_nt_PSID_ARRAY(tvbuff_t *tvb, int offset, int dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2812,7 +2812,7 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES(tvbuff_t *tvb, int offset, int dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2837,7 +2837,7 @@ dissect_ndr_nt_SID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_index(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -2853,7 +2853,7 @@ samr_dissect_index(tvbuff_t *tvb, int offset, static int samr_dissect_INDEX_ARRAY_value (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_index); @@ -2879,7 +2879,7 @@ plural_ending(const char *string) static int samr_dissect_INDEX_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { char *field_name; guint32 count; @@ -2913,7 +2913,7 @@ samr_dissect_INDEX_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_get_alias_membership_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -2928,7 +2928,7 @@ samr_dissect_get_alias_membership_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_alias_membership_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_INDEX_ARRAY, NDR_POINTER_REF, @@ -2943,7 +2943,7 @@ samr_dissect_get_alias_membership_reply(tvbuff_t *tvb, int offset, static int samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -2972,7 +2972,7 @@ samr_dissect_IDX_AND_NAME(tvbuff_t *tvb, int offset, static int samr_dissect_IDX_AND_NAME_entry (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_IDX_AND_NAME); @@ -2984,7 +2984,7 @@ samr_dissect_IDX_AND_NAME_entry (tvbuff_t *tvb, int offset, static int samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { char *field_name; guint32 count; @@ -3021,7 +3021,7 @@ samr_dissect_IDX_AND_NAME_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_IDX_AND_NAME_ARRAY_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { char *field_name; char str[256]; @@ -3041,7 +3041,7 @@ samr_dissect_IDX_AND_NAME_ARRAY_ptr(tvbuff_t *tvb, int offset, static int samr_dissect_enum_domains_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -3059,7 +3059,7 @@ samr_dissect_enum_domains_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_enum_domains_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_pointer_long, NDR_POINTER_REF, @@ -3082,7 +3082,7 @@ samr_dissect_enum_domains_reply(tvbuff_t *tvb, int offset, static int samr_dissect_enum_dom_groups_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -3103,7 +3103,7 @@ samr_dissect_enum_dom_groups_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_enum_dom_groups_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_pointer_long, NDR_POINTER_REF, @@ -3126,7 +3126,7 @@ samr_dissect_enum_dom_groups_reply(tvbuff_t *tvb, int offset, static int samr_dissect_enum_dom_aliases_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -3147,7 +3147,7 @@ samr_dissect_enum_dom_aliases_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_enum_dom_aliases_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_pointer_long, NDR_POINTER_REF, @@ -3170,7 +3170,7 @@ samr_dissect_enum_dom_aliases_reply(tvbuff_t *tvb, int offset, static int samr_dissect_get_members_in_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -3181,7 +3181,7 @@ samr_dissect_get_members_in_alias_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_get_members_in_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_PSID_ARRAY, NDR_POINTER_REF, @@ -3196,7 +3196,7 @@ samr_dissect_get_members_in_alias_reply(tvbuff_t *tvb, int offset, static int samr_dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8(tvb, offset, pinfo, tree, drep, hf_samr_unknown_char, NULL); @@ -3206,7 +3206,7 @@ samr_dissect_LOGON_HOURS_entry(tvbuff_t *tvb, int offset, static int samr_dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3230,7 +3230,7 @@ samr_dissect_LOGON_HOURS_hours(tvbuff_t *tvb, int offset, int dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3261,7 +3261,7 @@ dissect_ndr_nt_LOGON_HOURS(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3290,7 +3290,7 @@ samr_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3318,7 +3318,7 @@ samr_dissect_USER_INFO_2(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3372,7 +3372,7 @@ samr_dissect_USER_INFO_3(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_5(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3428,7 +3428,7 @@ samr_dissect_USER_INFO_5(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_6(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3452,7 +3452,7 @@ samr_dissect_USER_INFO_6(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_18(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3480,7 +3480,7 @@ samr_dissect_USER_INFO_18(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_19(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3509,7 +3509,7 @@ samr_dissect_USER_INFO_19(tvbuff_t *tvb, int offset, static int samr_dissect_BUFFER_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint8 (tvb, offset, pinfo, tree, drep, hf_samr_unknown_char, NULL); @@ -3520,7 +3520,7 @@ samr_dissect_BUFFER_entry(tvbuff_t *tvb, int offset, static int samr_dissect_BUFFER_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3544,7 +3544,7 @@ samr_dissect_BUFFER_buffer(tvbuff_t *tvb, int offset, static int samr_dissect_BUFFER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3568,7 +3568,7 @@ samr_dissect_BUFFER(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_21(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3651,7 +3651,7 @@ samr_dissect_USER_INFO_21(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_22(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3674,7 +3674,7 @@ samr_dissect_USER_INFO_22(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_23(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3696,7 +3696,7 @@ samr_dissect_USER_INFO_23(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_24(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3719,7 +3719,7 @@ samr_dissect_USER_INFO_24(tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3836,7 +3836,7 @@ samr_dissect_USER_INFO (tvbuff_t *tvb, int offset, static int samr_dissect_USER_INFO_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_USER_INFO, NDR_POINTER_UNIQUE, @@ -3847,7 +3847,7 @@ samr_dissect_USER_INFO_ptr(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_user2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -3870,7 +3870,7 @@ samr_dissect_set_information_user2_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_information_user2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -3881,7 +3881,7 @@ samr_dissect_set_information_user2_reply(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_user2_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint16 level; @@ -3900,7 +3900,7 @@ samr_dissect_query_information_user2_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_user2_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_USER_INFO_ptr, NDR_POINTER_REF, @@ -3915,7 +3915,7 @@ samr_dissect_query_information_user2_reply(tvbuff_t *tvb, int offset, static int samr_dissect_MEMBER_ARRAY_type(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_samr_type, NULL); @@ -3927,7 +3927,7 @@ samr_dissect_MEMBER_ARRAY_type(tvbuff_t *tvb, int offset, static int samr_dissect_MEMBER_ARRAY_types(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3951,7 +3951,7 @@ samr_dissect_MEMBER_ARRAY_types(tvbuff_t *tvb, int offset, static int samr_dissect_MEMBER_ARRAY_rid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_samr_rid, NULL); @@ -3963,7 +3963,7 @@ samr_dissect_MEMBER_ARRAY_rid(tvbuff_t *tvb, int offset, static int samr_dissect_MEMBER_ARRAY_rids(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -3987,7 +3987,7 @@ samr_dissect_MEMBER_ARRAY_rids(tvbuff_t *tvb, int offset, static int samr_dissect_MEMBER_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { guint32 count; proto_item *item=NULL; @@ -4016,7 +4016,7 @@ samr_dissect_MEMBER_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_MEMBER_ARRAY_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_MEMBER_ARRAY, NDR_POINTER_UNIQUE, @@ -4027,7 +4027,7 @@ samr_dissect_MEMBER_ARRAY_ptr(tvbuff_t *tvb, int offset, static int samr_dissect_query_groupmem_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4038,7 +4038,7 @@ samr_dissect_query_groupmem_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_query_groupmem_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_MEMBER_ARRAY_ptr, NDR_POINTER_REF, @@ -4053,7 +4053,7 @@ samr_dissect_query_groupmem_reply(tvbuff_t *tvb, int offset, static int samr_dissect_set_sec_object_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 info_type; @@ -4077,7 +4077,7 @@ samr_dissect_set_sec_object_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_set_sec_object_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4088,7 +4088,7 @@ samr_dissect_set_sec_object_reply(tvbuff_t *tvb, int offset, static int samr_dissect_query_sec_object_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 info_type; @@ -4108,7 +4108,7 @@ samr_dissect_query_sec_object_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_query_sec_object_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_SECURITY_DESCRIPTOR, NDR_POINTER_UNIQUE, @@ -4123,7 +4123,7 @@ samr_dissect_query_sec_object_reply(tvbuff_t *tvb, int offset, static int samr_dissect_LOOKUP_NAMES_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 1); @@ -4133,7 +4133,7 @@ samr_dissect_LOOKUP_NAMES_name(tvbuff_t *tvb, int offset, static int samr_dissect_LOOKUP_NAMES(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4156,7 +4156,7 @@ samr_dissect_LOOKUP_NAMES(tvbuff_t *tvb, int offset, static int samr_dissect_lookup_names_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4174,7 +4174,7 @@ samr_dissect_lookup_names_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_lookup_names_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_INDEX_ARRAY, NDR_POINTER_REF, @@ -4193,7 +4193,7 @@ samr_dissect_lookup_names_reply(tvbuff_t *tvb, int offset, static int samr_dissect_LOOKUP_RIDS_rid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_samr_rid, NULL); @@ -4204,7 +4204,7 @@ samr_dissect_LOOKUP_RIDS_rid(tvbuff_t *tvb, int offset, static int samr_dissect_LOOKUP_RIDS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4227,7 +4227,7 @@ samr_dissect_LOOKUP_RIDS(tvbuff_t *tvb, int offset, static int samr_dissect_lookup_rids_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4245,7 +4245,7 @@ samr_dissect_lookup_rids_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_UNICODE_STRING_ARRAY_name(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_counted_string(tvb, offset, pinfo, tree, drep, hf_samr_acct_name, 0); @@ -4255,7 +4255,7 @@ samr_dissect_UNICODE_STRING_ARRAY_name(tvbuff_t *tvb, int offset, static int samr_dissect_UNICODE_STRING_ARRAY_names(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, samr_dissect_UNICODE_STRING_ARRAY_name); @@ -4265,7 +4265,7 @@ samr_dissect_UNICODE_STRING_ARRAY_names(tvbuff_t *tvb, int offset, static int samr_dissect_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, - char *drep) + guint8 *drep) { proto_item *item=NULL; proto_tree *tree=NULL; @@ -4294,7 +4294,7 @@ samr_dissect_UNICODE_STRING_ARRAY(tvbuff_t *tvb, int offset, static int samr_dissect_lookup_rids_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_UNICODE_STRING_ARRAY, NDR_POINTER_REF, @@ -4312,7 +4312,7 @@ samr_dissect_lookup_rids_reply(tvbuff_t *tvb, int offset, static int samr_dissect_close_hnd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; char *name; @@ -4332,7 +4332,7 @@ samr_dissect_close_hnd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, static int samr_dissect_close_hnd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4346,7 +4346,7 @@ samr_dissect_close_hnd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, static int samr_dissect_shutdown_sam_server_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4357,7 +4357,7 @@ samr_dissect_shutdown_sam_server_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_shutdown_sam_server_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4368,7 +4368,7 @@ samr_dissect_shutdown_sam_server_reply(tvbuff_t *tvb, int offset, static int samr_dissect_delete_dom_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4379,7 +4379,7 @@ samr_dissect_delete_dom_group_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_delete_dom_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4390,7 +4390,7 @@ samr_dissect_delete_dom_group_reply(tvbuff_t *tvb, int offset, static int samr_dissect_remove_member_from_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4407,7 +4407,7 @@ samr_dissect_remove_member_from_group_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_remove_member_from_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4418,7 +4418,7 @@ samr_dissect_remove_member_from_group_reply(tvbuff_t *tvb, int offset, static int samr_dissect_delete_dom_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4429,7 +4429,7 @@ samr_dissect_delete_dom_alias_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_delete_dom_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4440,7 +4440,7 @@ samr_dissect_delete_dom_alias_reply(tvbuff_t *tvb, int offset, static int samr_dissect_add_alias_member_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4455,7 +4455,7 @@ samr_dissect_add_alias_member_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_add_alias_member_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4466,7 +4466,7 @@ samr_dissect_add_alias_member_reply(tvbuff_t *tvb, int offset, static int samr_dissect_remove_alias_member_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4481,7 +4481,7 @@ samr_dissect_remove_alias_member_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_remove_alias_member_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4492,7 +4492,7 @@ samr_dissect_remove_alias_member_reply(tvbuff_t *tvb, int offset, static int samr_dissect_delete_dom_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4503,7 +4503,7 @@ samr_dissect_delete_dom_user_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_delete_dom_user_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4514,7 +4514,7 @@ samr_dissect_delete_dom_user_reply(tvbuff_t *tvb, int offset, static int samr_dissect_test_private_fns_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4525,7 +4525,7 @@ samr_dissect_test_private_fns_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_test_private_fns_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4536,7 +4536,7 @@ samr_dissect_test_private_fns_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_test_private_fns_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4547,7 +4547,7 @@ samr_dissect_test_private_fns_user_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_test_private_fns_user_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4559,7 +4559,7 @@ static int samr_dissect_remove_member_from_foreign_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4575,7 +4575,7 @@ static int samr_dissect_remove_member_from_foreign_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4588,7 +4588,7 @@ samr_dissect_remove_multiple_members_from_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4605,7 +4605,7 @@ samr_dissect_remove_multiple_members_from_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4615,7 +4615,7 @@ samr_dissect_remove_multiple_members_from_alias_reply(tvbuff_t *tvb, static int samr_dissect_open_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4642,7 +4642,7 @@ samr_dissect_open_group_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, static int samr_dissect_open_group_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4678,7 +4678,7 @@ samr_dissect_open_group_reply(tvbuff_t *tvb, int offset, static int samr_dissect_open_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4705,7 +4705,7 @@ samr_dissect_open_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, static int samr_dissect_open_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4744,7 +4744,7 @@ samr_dissect_open_alias_reply(tvbuff_t *tvb, int offset, static int samr_dissect_add_multiple_members_to_alias_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4759,7 +4759,7 @@ samr_dissect_add_multiple_members_to_alias_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_add_multiple_members_to_alias_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ntstatus(tvb, offset, pinfo, tree, drep, hf_samr_rc, NULL); @@ -4770,7 +4770,7 @@ samr_dissect_add_multiple_members_to_alias_reply(tvbuff_t *tvb, int offset, static int samr_dissect_create_group_in_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_samr_hnd, NULL, NULL, FALSE, FALSE); @@ -4789,7 +4789,7 @@ samr_dissect_create_group_in_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_create_group_in_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; proto_item *hnd_item; @@ -4824,7 +4824,7 @@ samr_dissect_create_group_in_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_domain_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint16 level; @@ -4843,7 +4843,7 @@ samr_dissect_query_information_domain_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_domain_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* * Yes, in at least one capture with replies from a W2K server, @@ -4862,7 +4862,7 @@ samr_dissect_query_information_domain_reply(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_user_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint16 level; @@ -4881,7 +4881,7 @@ samr_dissect_query_information_user_rqst(tvbuff_t *tvb, int offset, static int samr_dissect_query_information_user_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, samr_dissect_USER_INFO_ptr, NDR_POINTER_REF, diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c index b5fdc6c7b3..5f0cee6ba8 100644 --- a/packet-dcerpc-spoolss.c +++ b/packet-dcerpc-spoolss.c @@ -2,7 +2,7 @@ * Routines for SMB \PIPE\spoolss packet disassembly * Copyright 2001-2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-spoolss.c,v 1.106 2003/10/15 08:08:28 guy Exp $ + * $Id: packet-dcerpc-spoolss.c,v 1.107 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -378,7 +378,7 @@ static gint ett_BUFFER = -1; static int dissect_spoolss_buffer_data(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = pinfo->private_data; BUFFER *b = (BUFFER *)di->private_data; @@ -428,7 +428,7 @@ dissect_spoolss_buffer_data(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_spoolss_buffer(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, BUFFER *b) + proto_tree *tree, guint8 *drep, BUFFER *b) { dcerpc_info *di = pinfo->private_data; @@ -462,7 +462,7 @@ static int hf_time_msec = -1; static int dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, char *name, + proto_tree *tree, guint8 *drep, char *name, gboolean add_subtree, char **data) { proto_item *item = NULL; @@ -516,7 +516,7 @@ dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_SYSTEM_TIME_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -536,7 +536,7 @@ dissect_SYSTEM_TIME_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { e_ctx_hnd policy_hnd; char *pol_name; @@ -559,7 +559,7 @@ static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset, static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { /* Parse packet */ @@ -584,7 +584,7 @@ static gint ett_printerdata_value = -1; static int dissect_printerdata_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_, guint32 type) + guint8 *drep _U_, guint32 type) { proto_item *item; proto_tree *subtree; @@ -660,7 +660,7 @@ static int dissect_printerdata_data(tvbuff_t *tvb, int offset, static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -694,7 +694,7 @@ static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset, static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -732,7 +732,7 @@ static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset, static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -788,7 +788,7 @@ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset, static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -831,7 +831,7 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset, static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { char *value_name = NULL; guint32 type; @@ -868,7 +868,7 @@ static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset, static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { proto_tree_add_uint_hidden( tree, hf_printerdata, tvb, offset, 0, 1); @@ -891,7 +891,7 @@ static int hf_setprinterdataex_data = -1; static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { char *key_name, *value_name; guint32 max_len; @@ -942,7 +942,7 @@ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset, static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { proto_tree_add_uint_hidden( tree, hf_printerdata, tvb, offset, 0, 1); @@ -963,7 +963,7 @@ static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset, /* XXX - "name" should be an hf_ value for an FT_STRING. */ static int dissect_spoolss_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep _U_, char **data, + proto_tree *tree, guint8 *drep _U_, char **data, char *name) { gint len, remaining; @@ -1271,7 +1271,7 @@ static gint ett_DEVMODE_fields; static int dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_, guint32 *pdata) + proto_tree *tree, guint8 *drep _U_, guint32 *pdata) { proto_item *item; proto_tree *subtree; @@ -1409,7 +1409,7 @@ dissect_DEVMODE_fields(tvbuff_t *tvb, gint offset, packet_info *pinfo, static gint ett_DEVMODE = -1; static int dissect_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = pinfo->private_data; proto_item *item; @@ -1595,7 +1595,7 @@ static int dissect_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_DEVMODE_CTR = -1; static int dissect_DEVMODE_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -1626,7 +1626,7 @@ static gint ett_RELSTR = -1; static int dissect_spoolss_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hf_index, + proto_tree *tree, guint8 *drep, int hf_index, int struct_start, char **data) { proto_item *item; @@ -1676,7 +1676,7 @@ static gint ett_RELSTR_ARRAY = -1; static int dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hf_index, + proto_tree *tree, guint8 *drep, int hf_index, int struct_start, char **data) { proto_item *item; @@ -1756,7 +1756,7 @@ static gint ett_PRINTER_INFO_0 = -1; static int dissect_PRINTER_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_spoolss_relstr( tvb, offset, pinfo, tree, drep, hf_printername, @@ -1878,7 +1878,7 @@ static gint ett_PRINTER_INFO_1 = -1; static int dissect_PRINTER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, @@ -1960,7 +1960,7 @@ static gint ett_job_status = -1; static int dissect_job_status(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -2103,7 +2103,7 @@ static const true_false_string tfs_printer_attributes_published = { static int dissect_printer_attributes(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -2184,7 +2184,7 @@ static gint ett_PRINTER_INFO_2 = -1; static int dissect_PRINTER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 devmode_offset, secdesc_offset; @@ -2298,7 +2298,7 @@ static gint ett_PRINTER_INFO_3 = -1; static int dissect_PRINTER_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32( tvb, offset, pinfo, tree, drep, @@ -2333,7 +2333,7 @@ static const value_string getprinter_action_vals[] = { static int dissect_PRINTER_INFO_7(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_spoolss_relstr( tvb, offset, pinfo, tree, drep, hf_printer_guid, @@ -2354,7 +2354,7 @@ static gint ett_PRINTER_DATATYPE = -1; static int dissect_PRINTER_DATATYPE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = pinfo->private_data; @@ -2384,7 +2384,7 @@ static int hf_userlevel_processor = -1; static int dissect_USER_LEVEL_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -2430,7 +2430,7 @@ static gint ett_USER_LEVEL_CTR = -1; static int dissect_USER_LEVEL_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = pinfo->private_data; proto_item *item; @@ -2471,7 +2471,7 @@ static int dissect_USER_LEVEL_CTR(tvbuff_t *tvb, int offset, static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -2530,7 +2530,7 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset, static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -2649,7 +2649,7 @@ static const value_string job_notify_option_data_vals[] = { static int dissect_notify_field(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, guint16 type, + proto_tree *tree, guint8 *drep, guint16 type, guint16 *data) { guint16 field; @@ -2684,7 +2684,7 @@ dissect_notify_field(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_NOTIFY_OPTION_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -2726,7 +2726,7 @@ static gint ett_NOTIFY_OPTION = -1; static int dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -2774,7 +2774,7 @@ dissect_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_NOTIFY_OPTIONS_ARRAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Why is a check for di->conformant_run not required here? */ @@ -2793,7 +2793,7 @@ static const true_false_string tfs_notify_options_flags_refresh = { static int dissect_notify_options_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -2818,7 +2818,7 @@ dissect_notify_options_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_NOTIFY_OPTIONS_ARRAY_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = pinfo->private_data; @@ -2979,7 +2979,7 @@ static const true_false_string tfs_rffpcnex_flags_timeout = { static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { guint32 flags; proto_item *flags_item; @@ -3116,7 +3116,7 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset, static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { /* Parse packet */ @@ -3132,7 +3132,7 @@ static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset, static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3173,7 +3173,7 @@ static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset, static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3239,7 +3239,7 @@ static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset, static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3271,7 +3271,7 @@ static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, static gint ett_PRINTER_INFO = -1; static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3354,7 +3354,7 @@ static int hf_secdescbuf_len = -1; static int dissect_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -3405,7 +3405,7 @@ static int hf_spool_printer_info_secdesc_ptr = -1; static int dissect_SPOOL_PRINTER_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -3474,7 +3474,7 @@ static const value_string setprinter_cmd_vals[] = { }; static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { guint32 level; @@ -3501,7 +3501,7 @@ static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { /* Parse packet */ @@ -3526,7 +3526,7 @@ static const value_string form_type_vals[] = static gint ett_FORM_REL = -1; static int dissect_FORM_REL(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, int struct_start) + proto_tree *tree, guint8 *drep, int struct_start) { proto_item *item; proto_tree *subtree; @@ -3584,7 +3584,7 @@ static int dissect_FORM_REL(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3617,7 +3617,7 @@ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3669,7 +3669,7 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { /* Parse packet */ @@ -3682,7 +3682,7 @@ static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset, static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { /* Parse packet */ @@ -3697,7 +3697,7 @@ static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset, } static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3769,7 +3769,7 @@ static int hf_enumprinterdata_data_needed = -1; static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { guint32 ndx; @@ -3802,7 +3802,7 @@ static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset, static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { guint32 value_len, type; char *value; @@ -3879,7 +3879,7 @@ static int hf_enumprinters_flags_network = -1; static int hf_enumprinters_flags_remote = -1; static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { guint32 level, flags; proto_tree *flags_subtree; @@ -3945,7 +3945,7 @@ static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { guint32 num_drivers; @@ -3973,7 +3973,7 @@ static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo, #if 0 static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -3992,7 +3992,7 @@ static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset, #endif static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep _U_) + guint8 *drep _U_) { /* Parse packet */ @@ -4009,7 +4009,7 @@ static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset, static gint ett_FORM_1 = -1; static int dissect_FORM_1(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4072,7 +4072,7 @@ static gint ett_FORM_CTR = -1; static int dissect_FORM_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4105,7 +4105,7 @@ static int dissect_FORM_CTR(tvbuff_t *tvb, int offset, */ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4136,7 +4136,7 @@ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { proto_tree_add_uint_hidden( tree, hf_form, tvb, offset, 0, 1); @@ -4154,7 +4154,7 @@ static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { char *name = NULL; @@ -4180,7 +4180,7 @@ static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { proto_tree_add_uint_hidden( tree, hf_form, tvb, offset, 0, 1); @@ -4198,7 +4198,7 @@ static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { char *name = NULL; guint32 level; @@ -4233,7 +4233,7 @@ static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { proto_tree_add_uint_hidden( tree, hf_form, tvb, offset, 0, 1); @@ -4251,7 +4251,7 @@ static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4292,7 +4292,7 @@ static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4345,7 +4345,7 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo, INFO column. */ static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { int len = tvb_length(tvb); @@ -4366,7 +4366,7 @@ static gint ett_JOB_INFO_1; static int dissect_spoolss_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4438,7 +4438,7 @@ static gint ett_JOB_INFO_2; static int dissect_spoolss_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4555,7 +4555,7 @@ static int hf_enumjobs_firstjob = -1; static int hf_enumjobs_numjobs = -1; static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4590,7 +4590,7 @@ static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4656,7 +4656,7 @@ static const value_string setjob_commands[] = { static int hf_setjob_cmd = -1; static int SpoolssSetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint32 jobid, cmd; @@ -4685,7 +4685,7 @@ static int SpoolssSetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssSetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -4700,7 +4700,7 @@ static int SpoolssSetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssGetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4733,7 +4733,7 @@ static int SpoolssGetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -4778,7 +4778,7 @@ static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; char *pol_name; @@ -4801,7 +4801,7 @@ static int SpoolssStartPagePrinter_q(tvbuff_t *tvb, int offset, static int SpoolssStartPagePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -4817,7 +4817,7 @@ static int SpoolssStartPagePrinter_r(tvbuff_t *tvb, int offset, static int SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; char *pol_name; @@ -4840,7 +4840,7 @@ static int SpoolssEndPagePrinter_q(tvbuff_t *tvb, int offset, static int SpoolssEndPagePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -4858,7 +4858,7 @@ static gint ett_DOC_INFO_1 = -1; static int dissect_spoolss_doc_info_1(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4885,7 +4885,7 @@ dissect_spoolss_doc_info_1(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_spoolss_doc_info_data(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = pinfo->private_data; guint32 info_level = 1; /* XXX */ @@ -4916,7 +4916,7 @@ static gint ett_DOC_INFO = -1; static int dissect_spoolss_doc_info(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4946,7 +4946,7 @@ static gint ett_DOC_INFO_CTR = -1; static int dissect_spoolss_doc_info_ctr(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -4971,7 +4971,7 @@ dissect_spoolss_doc_info_ctr(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; char *pol_name; @@ -4996,7 +4996,7 @@ static int SpoolssStartDocPrinter_q(tvbuff_t *tvb, int offset, static int SpoolssStartDocPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -5015,7 +5015,7 @@ static int SpoolssStartDocPrinter_r(tvbuff_t *tvb, int offset, static int SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; char *pol_name; @@ -5039,7 +5039,7 @@ static int SpoolssEndDocPrinter_q(tvbuff_t *tvb, int offset, static int SpoolssEndDocPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -5058,7 +5058,7 @@ static gint ett_writeprinter_buffer = -1; static int hf_writeprinter_numwritten = -1; static int SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { e_ctx_hnd policy_hnd; char *pol_name; @@ -5101,7 +5101,7 @@ static int SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssWritePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint32 size; @@ -5127,7 +5127,7 @@ static int SpoolssWritePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { char *value_name; @@ -5154,7 +5154,7 @@ static int SpoolssDeletePrinterData_q(tvbuff_t *tvb, int offset, static int SpoolssDeletePrinterData_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { proto_tree_add_uint_hidden( tree, hf_printerdata, tvb, offset, 0, 1); @@ -5176,7 +5176,7 @@ static gint ett_DRIVER_INFO_1 = -1; static int dissect_DRIVER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -5210,7 +5210,7 @@ static gint ett_DRIVER_INFO_3 = -1; static int dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -5269,7 +5269,7 @@ static int dissect_DRIVER_INFO_3(tvbuff_t *tvb, int offset, static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -5303,7 +5303,7 @@ static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset, static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -5358,7 +5358,7 @@ done: static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -5407,7 +5407,7 @@ static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset, static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -5454,7 +5454,7 @@ static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset, static int dissect_notify_info_data_buffer(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint32 len; @@ -5627,7 +5627,7 @@ job_notify_hf_index(int field) static int dissect_NOTIFY_INFO_DATA_printer(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, proto_item *item, - char *drep, guint16 field) + guint8 *drep, guint16 field) { guint32 value1; @@ -5746,7 +5746,7 @@ static void notify_job_time_cb(packet_info *pinfo, proto_tree *tree _U_, static int dissect_NOTIFY_INFO_DATA_job(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, proto_item *item, char *drep, + proto_tree *tree, proto_item *item, guint8 *drep, guint16 field) { guint32 value1; @@ -5863,7 +5863,7 @@ static gint ett_NOTIFY_INFO_DATA; static int dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { proto_item *item; proto_tree *subtree; @@ -5938,7 +5938,7 @@ dissect_NOTIFY_INFO_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_NOTIFY_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = pinfo->private_data; guint32 count; @@ -5968,7 +5968,7 @@ dissect_NOTIFY_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssRFNPCNEX_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint32 changeid; @@ -5994,7 +5994,7 @@ static int SpoolssRFNPCNEX_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssRFNPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -6014,7 +6014,7 @@ static int SpoolssRFNPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo, */ static int SpoolssRRPCN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { guint32 changeid; @@ -6051,7 +6051,7 @@ static int SpoolssRRPCN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssRRPCN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -6070,7 +6070,7 @@ static int SpoolssRRPCN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssReplyClosePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -6083,7 +6083,7 @@ static int SpoolssReplyClosePrinter_q(tvbuff_t *tvb, int offset, static int SpoolssReplyClosePrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -6102,7 +6102,7 @@ static int SpoolssReplyClosePrinter_r(tvbuff_t *tvb, int offset, */ static int SpoolssFCPN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -6114,7 +6114,7 @@ static int SpoolssFCPN_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssFCPN_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -6133,7 +6133,7 @@ static int hf_routerreplyprinter_unknown1 = -1; static int hf_routerreplyprinter_changeid = -1; static int SpoolssRouterReplyPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -6157,7 +6157,7 @@ static int SpoolssRouterReplyPrinter_q(tvbuff_t *tvb, int offset, packet_info *p } static int SpoolssRouterReplyPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { /* Parse packet */ @@ -6172,7 +6172,7 @@ static int hf_keybuffer_data = -1; static int dissect_spoolss_keybuffer(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = pinfo->private_data; guint32 size; @@ -6206,7 +6206,7 @@ dissect_spoolss_keybuffer(tvbuff_t *tvb, int offset, packet_info *pinfo, static int SpoolssEnumPrinterKey_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { char *key_name; @@ -6239,7 +6239,7 @@ static int SpoolssEnumPrinterKey_q(tvbuff_t *tvb, int offset, static int SpoolssEnumPrinterKey_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* Parse packet */ @@ -6267,7 +6267,7 @@ static int hf_enumprinterdataex_val_sz = -1; static int SpoolssEnumPrinterDataEx_q(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { char *key_name; @@ -6300,7 +6300,7 @@ static gint ett_printer_enumdataex_value = -1; static int dissect_spoolss_printer_enum_values(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 start_offset = offset; guint32 name_offset, name_len, val_offset, val_len, val_type; @@ -6429,7 +6429,7 @@ static gint ett_PRINTER_DATA_CTR; static int SpoolssEnumPrinterDataEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 size, num_values; @@ -6485,7 +6485,7 @@ static int SpoolssEnumPrinterDataEx_r(tvbuff_t *tvb, int offset, */ static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -6496,7 +6496,7 @@ static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c index 37dd169f9f..4d74b7e6a2 100644 --- a/packet-dcerpc-srvsvc.c +++ b/packet-dcerpc-srvsvc.c @@ -9,7 +9,7 @@ * 2002, some share information levels implemented based on samba * sources. * - * $Id: packet-dcerpc-srvsvc.c,v 1.63 2003/11/21 21:33:43 guy Exp $ + * $Id: packet-dcerpc-srvsvc.c,v 1.64 2004/01/19 20:10:35 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -258,7 +258,7 @@ static guint16 ver_dcerpc_srvsvc = 3; static int srvsvc_dissect_pointer_long(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -271,7 +271,7 @@ srvsvc_dissect_pointer_long(tvbuff_t *tvb, int offset, static int srvsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -288,7 +288,7 @@ srvsvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Char Device", @@ -300,7 +300,7 @@ srvsvc_dissect_CHARDEV_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEV_INFO_0); @@ -317,7 +317,7 @@ srvsvc_dissect_CHARDEV_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -340,7 +340,7 @@ srvsvc_dissect_CHARDEV_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Char Device", @@ -361,7 +361,7 @@ srvsvc_dissect_CHARDEV_INFO_1(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEV_INFO_1); @@ -378,7 +378,7 @@ srvsvc_dissect_CHARDEV_INFO_1_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -399,7 +399,7 @@ srvsvc_dissect_CHARDEV_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -432,7 +432,7 @@ srvsvc_dissect_CHARDEV_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -451,7 +451,7 @@ srvsvc_dissect_CHARDEV_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEV_INFO_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -487,7 +487,7 @@ srvsvc_dissect_CHARDEV_INFO_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -508,7 +508,7 @@ srvsvc_dissect_netrchardevenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEV_ENUM_STRUCT, @@ -539,7 +539,7 @@ srvsvc_dissect_netrchardevenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevgetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -555,7 +555,7 @@ srvsvc_dissect_netrchardevgetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevgetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEV_INFO_UNION, @@ -577,7 +577,7 @@ srvsvc_dissect_netrchardevgetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevcontrol_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -593,7 +593,7 @@ srvsvc_dissect_netrchardevcontrol_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevcontrol_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -611,7 +611,7 @@ srvsvc_dissect_netrchardevcontrol_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Char QDevice", hf_srvsvc_chrdev, 0); @@ -622,7 +622,7 @@ srvsvc_dissect_CHARDEVQ_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_INFO_0); @@ -639,7 +639,7 @@ srvsvc_dissect_CHARDEVQ_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -663,7 +663,7 @@ srvsvc_dissect_CHARDEVQ_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Char Device", hf_srvsvc_chrdev, 0); @@ -685,7 +685,7 @@ srvsvc_dissect_CHARDEVQ_INFO_1(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_INFO_1); @@ -702,7 +702,7 @@ srvsvc_dissect_CHARDEVQ_INFO_1_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -723,7 +723,7 @@ srvsvc_dissect_CHARDEVQ_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -756,7 +756,7 @@ srvsvc_dissect_CHARDEVQ_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -775,7 +775,7 @@ srvsvc_dissect_CHARDEVQ_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CHARDEVQ_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -813,7 +813,7 @@ srvsvc_dissect_CHARDEVQ_INFO(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -837,7 +837,7 @@ srvsvc_dissect_netrchardevqenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_ENUM_STRUCT, @@ -868,7 +868,7 @@ srvsvc_dissect_netrchardevqenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqgetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -887,7 +887,7 @@ srvsvc_dissect_netrchardevqgetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqgetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CHARDEVQ_INFO, @@ -911,7 +911,7 @@ srvsvc_dissect_netrchardevqgetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqsetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -935,7 +935,7 @@ srvsvc_dissect_netrchardevqsetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqsetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_long, NDR_POINTER_UNIQUE, @@ -956,7 +956,7 @@ srvsvc_dissect_netrchardevqsetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqpurge_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -969,7 +969,7 @@ srvsvc_dissect_netrchardevqpurge_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqpurge_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -987,7 +987,7 @@ srvsvc_dissect_netrchardevqpurge_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqpurgeself_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1003,7 +1003,7 @@ srvsvc_dissect_netrchardevqpurgeself_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrchardevqpurgeself_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -1021,7 +1021,7 @@ srvsvc_dissect_netrchardevqpurgeself_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_con_id, NULL); @@ -1031,7 +1031,7 @@ srvsvc_dissect_CONNECT_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CONNECT_INFO_0); @@ -1048,7 +1048,7 @@ srvsvc_dissect_CONNECT_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1075,7 +1075,7 @@ srvsvc_dissect_CONNECT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_con_id, NULL); @@ -1103,7 +1103,7 @@ srvsvc_dissect_CONNECT_INFO_1(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CONNECT_INFO_1); @@ -1120,7 +1120,7 @@ srvsvc_dissect_CONNECT_INFO_1_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1142,7 +1142,7 @@ srvsvc_dissect_CONNECT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -1176,7 +1176,7 @@ srvsvc_dissect_CONNECT_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_CONNECT_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -1200,7 +1200,7 @@ srvsvc_dissect_CONNECT_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrconnectionenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1224,7 +1224,7 @@ srvsvc_dissect_netrconnectionenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrconnectionenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_CONNECT_ENUM_STRUCT, @@ -1251,7 +1251,7 @@ srvsvc_dissect_netrconnectionenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_file_id, NULL); @@ -1261,7 +1261,7 @@ srvsvc_dissect_FILE_INFO_2(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_2_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_FILE_INFO_2); @@ -1278,7 +1278,7 @@ srvsvc_dissect_FILE_INFO_2_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1303,7 +1303,7 @@ srvsvc_dissect_FILE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_file_id, NULL); @@ -1325,7 +1325,7 @@ srvsvc_dissect_FILE_INFO_3(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_3_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_FILE_INFO_3); @@ -1342,7 +1342,7 @@ srvsvc_dissect_FILE_INFO_3_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_3_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1364,7 +1364,7 @@ srvsvc_dissect_FILE_INFO_3_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -1397,7 +1397,7 @@ srvsvc_dissect_FILE_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_INFO_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -1431,7 +1431,7 @@ srvsvc_dissect_FILE_INFO_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_FILE_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -1456,7 +1456,7 @@ srvsvc_dissect_FILE_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrfileenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1483,7 +1483,7 @@ srvsvc_dissect_netrfileenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrfileenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_FILE_ENUM_STRUCT, @@ -1514,7 +1514,7 @@ srvsvc_dissect_netrfileenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrfilegetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1530,7 +1530,7 @@ srvsvc_dissect_netrfilegetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrfilegetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_FILE_INFO_UNION, @@ -1552,7 +1552,7 @@ srvsvc_dissect_netrfilegetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrfileclose_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -1565,7 +1565,7 @@ srvsvc_dissect_netrfileclose_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrfileclose_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -1581,7 +1581,7 @@ srvsvc_dissect_netrfileclose_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); @@ -1591,7 +1591,7 @@ srvsvc_dissect_SESSION_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_INFO_0); @@ -1608,7 +1608,7 @@ srvsvc_dissect_SESSION_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1633,7 +1633,7 @@ srvsvc_dissect_SESSION_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); @@ -1658,7 +1658,7 @@ srvsvc_dissect_SESSION_INFO_1(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_INFO_1); @@ -1675,7 +1675,7 @@ srvsvc_dissect_SESSION_INFO_1_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1701,7 +1701,7 @@ srvsvc_dissect_SESSION_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); @@ -1730,7 +1730,7 @@ srvsvc_dissect_SESSION_INFO_2(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_2_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_INFO_2); @@ -1747,7 +1747,7 @@ srvsvc_dissect_SESSION_INFO_2_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1770,7 +1770,7 @@ srvsvc_dissect_SESSION_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_10(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); @@ -1789,7 +1789,7 @@ srvsvc_dissect_SESSION_INFO_10(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_10_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_INFO_10); @@ -1806,7 +1806,7 @@ srvsvc_dissect_SESSION_INFO_10_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_10_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1833,7 +1833,7 @@ srvsvc_dissect_SESSION_INFO_10_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Session", hf_srvsvc_session, 0); @@ -1865,7 +1865,7 @@ srvsvc_dissect_SESSION_INFO_502(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_502_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_INFO_502); @@ -1882,7 +1882,7 @@ srvsvc_dissect_SESSION_INFO_502_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -1906,7 +1906,7 @@ srvsvc_dissect_SESSION_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -1954,7 +1954,7 @@ srvsvc_dissect_SESSION_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SESSION_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -1979,7 +1979,7 @@ srvsvc_dissect_SESSION_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsessionenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -2006,7 +2006,7 @@ srvsvc_dissect_netrsessionenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsessionenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SESSION_ENUM_STRUCT, @@ -2036,7 +2036,7 @@ srvsvc_dissect_netrsessionenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsessiondel_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -2052,7 +2052,7 @@ srvsvc_dissect_netrsessiondel_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsessiondel_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -2069,7 +2069,7 @@ srvsvc_dissect_netrsessiondel_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Share", hf_srvsvc_share, 0); @@ -2079,7 +2079,7 @@ srvsvc_dissect_SHARE_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_0); @@ -2096,7 +2096,7 @@ srvsvc_dissect_SHARE_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2116,7 +2116,7 @@ srvsvc_dissect_SHARE_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_1; */ static int -srvsvc_dissect_SHARE_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) +srvsvc_dissect_SHARE_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -2143,7 +2143,7 @@ srvsvc_dissect_SHARE_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int srvsvc_dissect_SHARE_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_1); @@ -2160,7 +2160,7 @@ srvsvc_dissect_SHARE_INFO_1_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2185,7 +2185,7 @@ srvsvc_dissect_SHARE_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_2; */ static int -srvsvc_dissect_SHARE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) +srvsvc_dissect_SHARE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -2228,7 +2228,7 @@ srvsvc_dissect_SHARE_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo, proto static int srvsvc_dissect_SHARE_INFO_2_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_2); @@ -2245,7 +2245,7 @@ srvsvc_dissect_SHARE_INFO_2_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2266,7 +2266,7 @@ srvsvc_dissect_SHARE_INFO_2_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_501; */ static int -srvsvc_dissect_SHARE_INFO_501(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) +srvsvc_dissect_SHARE_INFO_501(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -2296,7 +2296,7 @@ srvsvc_dissect_SHARE_INFO_501(tvbuff_t *tvb, int offset, packet_info *pinfo, pro static int srvsvc_dissect_SHARE_INFO_501_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_501); @@ -2313,7 +2313,7 @@ srvsvc_dissect_SHARE_INFO_501_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_501_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2341,7 +2341,7 @@ srvsvc_dissect_SHARE_INFO_501_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_502; */ static int -srvsvc_dissect_SHARE_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, char *drep) +srvsvc_dissect_SHARE_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *parent_tree, guint8 *drep) { proto_item *item = NULL; proto_tree *tree = NULL; @@ -2391,7 +2391,7 @@ srvsvc_dissect_SHARE_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, pro static int srvsvc_dissect_SHARE_INFO_502_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_502); @@ -2408,7 +2408,7 @@ srvsvc_dissect_SHARE_INFO_502_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2427,7 +2427,7 @@ srvsvc_dissect_SHARE_INFO_502_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_1004; */ static int -srvsvc_dissect_SHARE_INFO_1004(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) +srvsvc_dissect_SHARE_INFO_1004(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Comment", hf_srvsvc_comment, 0); @@ -2438,7 +2438,7 @@ srvsvc_dissect_SHARE_INFO_1004(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int srvsvc_dissect_SHARE_INFO_1004_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_1004); @@ -2455,7 +2455,7 @@ srvsvc_dissect_SHARE_INFO_1004_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_1004_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 count; @@ -2477,7 +2477,7 @@ srvsvc_dissect_SHARE_INFO_1004_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_1005; */ static int -srvsvc_dissect_SHARE_INFO_1005(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) +srvsvc_dissect_SHARE_INFO_1005(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_dfs_root_flags, NULL); @@ -2487,7 +2487,7 @@ srvsvc_dissect_SHARE_INFO_1005(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int srvsvc_dissect_SHARE_INFO_1005_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_1005); @@ -2504,7 +2504,7 @@ srvsvc_dissect_SHARE_INFO_1005_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_1005_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2523,7 +2523,7 @@ srvsvc_dissect_SHARE_INFO_1005_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_1006; */ static int -srvsvc_dissect_SHARE_INFO_1006(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) +srvsvc_dissect_SHARE_INFO_1006(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_max_uses, NULL); @@ -2533,7 +2533,7 @@ srvsvc_dissect_SHARE_INFO_1006(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int srvsvc_dissect_SHARE_INFO_1006_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_1006); @@ -2550,7 +2550,7 @@ srvsvc_dissect_SHARE_INFO_1006_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_1006_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2570,7 +2570,7 @@ srvsvc_dissect_SHARE_INFO_1006_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_1007; */ static int -srvsvc_dissect_SHARE_INFO_1007(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) +srvsvc_dissect_SHARE_INFO_1007(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_share_flags, NULL); @@ -2584,7 +2584,7 @@ srvsvc_dissect_SHARE_INFO_1007(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int srvsvc_dissect_SHARE_INFO_1007_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_1007); @@ -2601,7 +2601,7 @@ srvsvc_dissect_SHARE_INFO_1007_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_1007_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2619,7 +2619,7 @@ srvsvc_dissect_SHARE_INFO_1007_CONTAINER(tvbuff_t *tvb, int offset, IDL } SHARE_INFO_1501; */ static int -srvsvc_dissect_SHARE_INFO_1501(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) +srvsvc_dissect_SHARE_INFO_1501(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_SECURITY_DESCRIPTOR_data, NDR_POINTER_UNIQUE, @@ -2630,7 +2630,7 @@ srvsvc_dissect_SHARE_INFO_1501(tvbuff_t *tvb, int offset, packet_info *pinfo, pr static int srvsvc_dissect_SHARE_INFO_1501_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_1501); @@ -2647,7 +2647,7 @@ srvsvc_dissect_SHARE_INFO_1501_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_1501_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -2677,7 +2677,7 @@ srvsvc_dissect_SHARE_INFO_1501_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_INFO_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -2759,7 +2759,7 @@ srvsvc_dissect_SHARE_INFO_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrshareadd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -2780,7 +2780,7 @@ srvsvc_dissect_netrshareadd_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrshareadd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_long, NDR_POINTER_UNIQUE, @@ -2810,7 +2810,7 @@ srvsvc_dissect_netrshareadd_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -2884,7 +2884,7 @@ srvsvc_dissect_SHARE_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SHARE_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = srvsvc_dissect_SHARE_ENUM_UNION(tvb, offset, pinfo, tree, drep); @@ -2904,7 +2904,7 @@ srvsvc_dissect_SHARE_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrshareenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -2929,7 +2929,7 @@ srvsvc_dissect_netrshareenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrshareenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -2962,7 +2962,7 @@ srvsvc_dissect_netrshareenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer_cb( tvb, offset, pinfo, tree, drep, @@ -2985,7 +2985,7 @@ srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharegetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_INFO_UNION, @@ -3009,7 +3009,7 @@ srvsvc_dissect_netrsharegetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharesetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -3033,7 +3033,7 @@ srvsvc_dissect_netrsharesetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharesetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_long, NDR_POINTER_UNIQUE, @@ -3055,7 +3055,7 @@ srvsvc_dissect_netrsharesetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedel_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -3071,7 +3071,7 @@ srvsvc_dissect_netrsharedel_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedel_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -3089,7 +3089,7 @@ srvsvc_dissect_netrsharedel_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedelsticky_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -3105,7 +3105,7 @@ srvsvc_dissect_netrsharedelsticky_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedelsticky_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -3123,7 +3123,7 @@ srvsvc_dissect_netrsharedelsticky_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharecheck_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -3136,7 +3136,7 @@ srvsvc_dissect_netrsharecheck_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharecheck_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_share_type, NULL); @@ -3156,7 +3156,7 @@ srvsvc_dissect_netrsharecheck_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_100(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_platform_id, NULL); @@ -3180,7 +3180,7 @@ srvsvc_dissect_SERVER_INFO_100(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_101(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_platform_id, NULL); @@ -3223,7 +3223,7 @@ srvsvc_dissect_SERVER_INFO_101(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_102(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_platform_id, NULL); @@ -3304,7 +3304,7 @@ srvsvc_dissect_SERVER_INFO_102(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_402(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ulist_mtime, NULL); @@ -3440,7 +3440,7 @@ srvsvc_dissect_SERVER_INFO_402(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_403(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_ulist_mtime, NULL); @@ -3570,7 +3570,7 @@ srvsvc_dissect_SERVER_INFO_403(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); @@ -3678,7 +3678,7 @@ srvsvc_dissect_SERVER_INFO_502(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_503(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); @@ -3873,7 +3873,7 @@ srvsvc_dissect_SERVER_INFO_503(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_599(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); @@ -4057,7 +4057,7 @@ srvsvc_dissect_SERVER_INFO_599(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1005(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Comment", hf_srvsvc_comment, 0); @@ -4073,7 +4073,7 @@ srvsvc_dissect_SERVER_INFO_1005(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1010(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_disc, NULL); @@ -4089,7 +4089,7 @@ srvsvc_dissect_SERVER_INFO_1010(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1016(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_hidden, NULL); @@ -4105,7 +4105,7 @@ srvsvc_dissect_SERVER_INFO_1016(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1017(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_announce, NULL); @@ -4121,7 +4121,7 @@ srvsvc_dissect_SERVER_INFO_1017(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1018(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_anndelta, NULL); @@ -4137,7 +4137,7 @@ srvsvc_dissect_SERVER_INFO_1018(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1107(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); @@ -4153,7 +4153,7 @@ srvsvc_dissect_SERVER_INFO_1107(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1501(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessopens, NULL); @@ -4169,7 +4169,7 @@ srvsvc_dissect_SERVER_INFO_1501(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1502(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_sessvcs, NULL); @@ -4185,7 +4185,7 @@ srvsvc_dissect_SERVER_INFO_1502(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1503(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_opensearch, NULL); @@ -4201,7 +4201,7 @@ srvsvc_dissect_SERVER_INFO_1503(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1506(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitems, NULL); @@ -4217,7 +4217,7 @@ srvsvc_dissect_SERVER_INFO_1506(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1509(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxrawbuflen, NULL); @@ -4233,7 +4233,7 @@ srvsvc_dissect_SERVER_INFO_1509(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1510(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_srvsvc_users, NULL); @@ -4249,7 +4249,7 @@ srvsvc_dissect_SERVER_INFO_1510(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1511(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_connections, NULL); @@ -4265,7 +4265,7 @@ srvsvc_dissect_SERVER_INFO_1511(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1512(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxnonpagedmemoryusage, NULL); @@ -4281,7 +4281,7 @@ srvsvc_dissect_SERVER_INFO_1512(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1513(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxpagedmemoryusage, NULL); @@ -4297,7 +4297,7 @@ srvsvc_dissect_SERVER_INFO_1513(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1514(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesoftcompat, NULL); @@ -4313,7 +4313,7 @@ srvsvc_dissect_SERVER_INFO_1514(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1515(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableforcedlogoff, NULL); @@ -4329,7 +4329,7 @@ srvsvc_dissect_SERVER_INFO_1515(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1516(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_timesource, NULL); @@ -4345,7 +4345,7 @@ srvsvc_dissect_SERVER_INFO_1516(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1518(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_lmannounce, NULL); @@ -4361,7 +4361,7 @@ srvsvc_dissect_SERVER_INFO_1518(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1520(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopyreadlen, NULL); @@ -4377,7 +4377,7 @@ srvsvc_dissect_SERVER_INFO_1520(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1521(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxcopywritelen, NULL); @@ -4393,7 +4393,7 @@ srvsvc_dissect_SERVER_INFO_1521(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1522(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepsearch, NULL); @@ -4409,7 +4409,7 @@ srvsvc_dissect_SERVER_INFO_1522(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1523(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepsearch, NULL); @@ -4425,7 +4425,7 @@ srvsvc_dissect_SERVER_INFO_1523(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1524(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minkeepcomplsearch, NULL); @@ -4441,7 +4441,7 @@ srvsvc_dissect_SERVER_INFO_1524(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1525(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxkeepcomplsearch, NULL); @@ -4457,7 +4457,7 @@ srvsvc_dissect_SERVER_INFO_1525(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1528(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_scavtimeout, NULL); @@ -4473,7 +4473,7 @@ srvsvc_dissect_SERVER_INFO_1528(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1529(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minrcvqueue, NULL); @@ -4489,7 +4489,7 @@ srvsvc_dissect_SERVER_INFO_1529(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1530(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeworkitems, NULL); @@ -4505,7 +4505,7 @@ srvsvc_dissect_SERVER_INFO_1530(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1533(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxmpxct, NULL); @@ -4521,7 +4521,7 @@ srvsvc_dissect_SERVER_INFO_1533(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1534(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakwait, NULL); @@ -4537,7 +4537,7 @@ srvsvc_dissect_SERVER_INFO_1534(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1535(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_oplockbreakresponsewait, NULL); @@ -4553,7 +4553,7 @@ srvsvc_dissect_SERVER_INFO_1535(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1536(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplocks, NULL); @@ -4569,7 +4569,7 @@ srvsvc_dissect_SERVER_INFO_1536(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1537(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableoplockforceclose, NULL); @@ -4585,7 +4585,7 @@ srvsvc_dissect_SERVER_INFO_1537(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1538(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablefcbopens, NULL); @@ -4601,7 +4601,7 @@ srvsvc_dissect_SERVER_INFO_1538(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1539(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enableraw, NULL); @@ -4617,7 +4617,7 @@ srvsvc_dissect_SERVER_INFO_1539(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1540(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_enablesharednetdrives, NULL); @@ -4633,7 +4633,7 @@ srvsvc_dissect_SERVER_INFO_1540(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1541(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minfreeconnections, NULL); @@ -4649,7 +4649,7 @@ srvsvc_dissect_SERVER_INFO_1541(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1542(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxfreeconnections, NULL); @@ -4665,7 +4665,7 @@ srvsvc_dissect_SERVER_INFO_1542(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1543(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initsesstable, NULL); @@ -4681,7 +4681,7 @@ srvsvc_dissect_SERVER_INFO_1543(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1544(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initconntable, NULL); @@ -4697,7 +4697,7 @@ srvsvc_dissect_SERVER_INFO_1544(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1545(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initfiletable, NULL); @@ -4713,7 +4713,7 @@ srvsvc_dissect_SERVER_INFO_1545(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1546(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_initsearchtable, NULL); @@ -4729,7 +4729,7 @@ srvsvc_dissect_SERVER_INFO_1546(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1547(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_alertsched, NULL); @@ -4745,7 +4745,7 @@ srvsvc_dissect_SERVER_INFO_1547(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1548(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_errortreshold, NULL); @@ -4761,7 +4761,7 @@ srvsvc_dissect_SERVER_INFO_1548(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1549(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_networkerrortreshold, NULL); @@ -4777,7 +4777,7 @@ srvsvc_dissect_SERVER_INFO_1549(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1550(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_diskspacetreshold, NULL); @@ -4793,7 +4793,7 @@ srvsvc_dissect_SERVER_INFO_1550(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1552(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxlinkdelay, NULL); @@ -4809,7 +4809,7 @@ srvsvc_dissect_SERVER_INFO_1552(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1553(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_minlinkthroughput, NULL); @@ -4825,7 +4825,7 @@ srvsvc_dissect_SERVER_INFO_1553(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1554(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_linkinfovalidtime, NULL); @@ -4841,7 +4841,7 @@ srvsvc_dissect_SERVER_INFO_1554(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1555(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_scavqosinfoupdatetime, NULL); @@ -4857,7 +4857,7 @@ srvsvc_dissect_SERVER_INFO_1555(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_1556(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_maxworkitemidletime, NULL); @@ -4931,7 +4931,7 @@ srvsvc_dissect_SERVER_INFO_1556(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_INFO_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -5309,7 +5309,7 @@ srvsvc_dissect_SERVER_INFO_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer_cb( tvb, offset, pinfo, tree, drep, @@ -5325,7 +5325,7 @@ srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservergetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_INFO_UNION, @@ -5348,7 +5348,7 @@ srvsvc_dissect_netrservergetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserversetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5369,7 +5369,7 @@ srvsvc_dissect_netrserversetinfo_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserversetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_pointer_long, NDR_POINTER_UNIQUE, @@ -5390,7 +5390,7 @@ srvsvc_dissect_netrserversetinfo_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_DISK_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -5417,7 +5417,7 @@ srvsvc_dissect_DISK_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_DISK_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucvarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_DISK_INFO_0); @@ -5434,7 +5434,7 @@ srvsvc_dissect_DISK_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_DISK_ENUM_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -5460,7 +5460,7 @@ srvsvc_dissect_DISK_ENUM_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserverdiskenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5484,7 +5484,7 @@ srvsvc_dissect_netrserverdiskenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserverdiskenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_DISK_ENUM_CONTAINER, @@ -5528,7 +5528,7 @@ srvsvc_dissect_netrserverdiskenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_STAT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_server_stat_start, NULL); @@ -5590,7 +5590,7 @@ srvsvc_dissect_SERVER_STAT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserverstatisticsget_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5609,7 +5609,7 @@ srvsvc_dissect_netrserverstatisticsget_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserverstatisticsget_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_STAT, @@ -5629,7 +5629,7 @@ srvsvc_dissect_netrserverstatisticsget_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_TRANSPORT_ADDRESS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; guint32 len; @@ -5662,7 +5662,7 @@ srvsvc_dissect_TRANSPORT_ADDRESS(tvbuff_t *tvb, int offset, static int srvsvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_numberofvcs, 0); @@ -5687,7 +5687,7 @@ srvsvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, static int srvsvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TRANSPORT_INFO_0); @@ -5704,7 +5704,7 @@ srvsvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_XPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -5728,7 +5728,7 @@ srvsvc_dissect_SERVER_XPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_TRANSPORT_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_transport_numberofvcs, 0); @@ -5756,7 +5756,7 @@ srvsvc_dissect_TRANSPORT_INFO_1(tvbuff_t *tvb, int offset, static int srvsvc_dissect_TRANSPORT_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TRANSPORT_INFO_1); @@ -5773,7 +5773,7 @@ srvsvc_dissect_TRANSPORT_INFO_1_array(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_XPORT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_num_entries, NULL); @@ -5795,7 +5795,7 @@ srvsvc_dissect_SERVER_XPORT_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_XPORT_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -5830,7 +5830,7 @@ srvsvc_dissect_SERVER_XPORT_ENUM_UNION(tvbuff_t *tvb, int offset, static int srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -5852,7 +5852,7 @@ srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportadd_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5869,7 +5869,7 @@ srvsvc_dissect_netrservertransportadd_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportadd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -5889,7 +5889,7 @@ srvsvc_dissect_netrservertransportadd_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5910,7 +5910,7 @@ srvsvc_dissect_netrservertransportenum_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SERVER_XPORT_ENUM_STRUCT, @@ -5940,7 +5940,7 @@ srvsvc_dissect_netrservertransportenum_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportdel_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -5957,7 +5957,7 @@ srvsvc_dissect_netrservertransportdel_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportdel_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -5984,7 +5984,7 @@ srvsvc_dissect_netrservertransportdel_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_TIMEOFDAY(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* * XXX - is "hf_srvsvc_tod_elapsed" something that should be @@ -6035,7 +6035,7 @@ srvsvc_dissect_TIMEOFDAY(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrremotetod_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6045,7 +6045,7 @@ srvsvc_dissect_netrremotetod_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrremotetod_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_TIMEOFDAY, @@ -6068,7 +6068,7 @@ srvsvc_dissect_netrremotetod_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsetserverservicebits_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6087,7 +6087,7 @@ srvsvc_dissect_netrsetserverservicebits_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsetserverservicebits_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -6106,7 +6106,7 @@ srvsvc_dissect_netrsetserverservicebits_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrpathtype_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6122,7 +6122,7 @@ srvsvc_dissect_netrpathtype_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrpathtype_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_path_type, NULL); @@ -6146,7 +6146,7 @@ srvsvc_dissect_netrpathtype_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrpathcanonicalize_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6171,7 +6171,7 @@ srvsvc_dissect_netrpathcanonicalize_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrpathcanonicalize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -6211,7 +6211,7 @@ srvsvc_dissect_netrpathcanonicalize_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrpathcompare_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6233,7 +6233,7 @@ srvsvc_dissect_netrpathcompare_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrpathcompare_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -6253,7 +6253,7 @@ srvsvc_dissect_netrpathcompare_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrnamevalidate_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6272,7 +6272,7 @@ srvsvc_dissect_netrnamevalidate_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrnamevalidate_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -6293,7 +6293,7 @@ srvsvc_dissect_netrnamevalidate_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrnamecanonicalize_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6315,7 +6315,7 @@ srvsvc_dissect_netrnamecanonicalize_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrnamecanonicalize_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 len; dcerpc_info *di; @@ -6352,7 +6352,7 @@ srvsvc_dissect_netrnamecanonicalize_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrnamecompare_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6374,7 +6374,7 @@ srvsvc_dissect_netrnamecompare_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrnamecompare_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -6395,7 +6395,7 @@ srvsvc_dissect_netrnamecompare_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrshareenumsticky_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6416,7 +6416,7 @@ srvsvc_dissect_netrshareenumsticky_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrshareenumsticky_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, srvsvc_dissect_SHARE_ENUM_STRUCT, @@ -6447,7 +6447,7 @@ srvsvc_dissect_netrshareenumsticky_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedelstart_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6463,7 +6463,7 @@ srvsvc_dissect_netrsharedelstart_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedelstart_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_srvsvc_hnd, NULL, NULL, TRUE, FALSE); @@ -6482,7 +6482,7 @@ srvsvc_dissect_netrsharedelstart_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedelcommit_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_srvsvc_hnd, NULL, NULL, TRUE, FALSE); @@ -6492,7 +6492,7 @@ srvsvc_dissect_netrsharedelcommit_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsharedelcommit_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep, hf_srvsvc_hnd, NULL, NULL, TRUE, FALSE); @@ -6517,7 +6517,7 @@ srvsvc_dissect_netrsharedelcommit_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrgetfilesecurity_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6536,7 +6536,7 @@ srvsvc_dissect_netrgetfilesecurity_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrgetfilesecurity_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, lsa_dissect_LSA_SECURITY_DESCRIPTOR_data, NDR_POINTER_REF, @@ -6561,7 +6561,7 @@ srvsvc_dissect_netrgetfilesecurity_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsetfilesecurity_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6584,7 +6584,7 @@ srvsvc_dissect_netrsetfilesecurity_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrsetfilesecurity_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -6603,7 +6603,7 @@ srvsvc_dissect_netrsetfilesecurity_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportaddex_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6620,7 +6620,7 @@ srvsvc_dissect_netrservertransportaddex_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrservertransportaddex_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); @@ -6642,7 +6642,7 @@ srvsvc_dissect_netrservertransportaddex_reply(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserversetservicebitsex_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); @@ -6668,7 +6668,7 @@ srvsvc_dissect_netrserversetservicebitsex_rqst(tvbuff_t *tvb, int offset, static int srvsvc_dissect_netrserversetservicebitsex_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_doserror(tvb, offset, pinfo, tree, drep, hf_srvsvc_rc, NULL); diff --git a/packet-dcerpc-svcctl.c b/packet-dcerpc-svcctl.c index d8c171ee51..e235e736c6 100644 --- a/packet-dcerpc-svcctl.c +++ b/packet-dcerpc-svcctl.c @@ -3,7 +3,7 @@ * Copyright 2003, Tim Potter <tpot@samba.org> * Copyright 2003, Ronnie Sahlberg, added function dissectors * - * $Id: packet-dcerpc-svcctl.c,v 1.13 2003/12/17 21:34:44 ulfl Exp $ + * $Id: packet-dcerpc-svcctl.c,v 1.14 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -73,7 +73,7 @@ static guint16 ver_dcerpc_svcctl = 2; static int svcctl_dissect_pointer_long(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -113,7 +113,7 @@ struct access_mask_info svcctl_scm_access_mask_info = { static int svcctl_dissect_OpenSCManager_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* MachineName */ offset = dissect_ndr_pointer_cb( @@ -140,7 +140,7 @@ svcctl_dissect_OpenSCManager_rqst(tvbuff_t *tvb, int offset, static int svcctl_dissect_OpenSCManager_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di = (dcerpc_info *)pinfo->private_data; dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data; @@ -209,7 +209,7 @@ svcctl_dissect_OpenSCManager_reply(tvbuff_t *tvb, int offset, static int svcctl_dissect_CloseServiceHandle_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { e_ctx_hnd policy_hnd; char *pol_name; @@ -233,7 +233,7 @@ svcctl_dissect_CloseServiceHandle_rqst(tvbuff_t *tvb, int offset, static int svcctl_dissect_CloseServiceHandle_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_nt_policy_hnd( tvb, offset, pinfo, tree, drep, hf_svcctl_hnd, NULL, @@ -256,7 +256,7 @@ svcctl_dissect_CloseServiceHandle_reply(tvbuff_t *tvb, int offset, static int svcctl_dissect_LockServiceDatabase_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* XXX - why is the "is a close" argument TRUE? */ offset = dissect_nt_policy_hnd( @@ -268,7 +268,7 @@ svcctl_dissect_LockServiceDatabase_rqst(tvbuff_t *tvb, int offset, static int svcctl_dissect_LockServiceDatabase_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* XXX - why is the "is an open" argument TRUE? */ offset = dissect_nt_policy_hnd( @@ -291,7 +291,7 @@ svcctl_dissect_LockServiceDatabase_reply(tvbuff_t *tvb, int offset, static int svcctl_dissect_UnlockServiceDatabase_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* XXX - why is the "is a close" argument TRUE? */ offset = dissect_nt_policy_hnd( @@ -303,7 +303,7 @@ svcctl_dissect_UnlockServiceDatabase_rqst(tvbuff_t *tvb, int offset, static int svcctl_dissect_UnlockServiceDatabase_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* XXX - why is the "is an open" argument TRUE? */ offset = dissect_nt_policy_hnd( @@ -327,7 +327,7 @@ svcctl_dissect_UnlockServiceDatabase_reply(tvbuff_t *tvb, int offset, static int svcctl_dissect_QUERY_SERVICE_LOCK_STATUS(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_svcctl_is_locked, NULL); @@ -354,7 +354,7 @@ svcctl_dissect_QUERY_SERVICE_LOCK_STATUS(tvbuff_t *tvb, int offset, static int svcctl_dissect_QueryServiceLockStatus_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* XXX - why is the "is a close" argument TRUE? */ offset = dissect_nt_policy_hnd( @@ -369,7 +369,7 @@ svcctl_dissect_QueryServiceLockStatus_rqst(tvbuff_t *tvb, int offset, static int svcctl_dissect_QueryServiceLockStatus_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, svcctl_dissect_QUERY_SERVICE_LOCK_STATUS, NDR_POINTER_REF, @@ -416,7 +416,7 @@ static const value_string svcctl_service_status_vals[] = { static int svcctl_dissect_EnumServicesStatus_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* XXX - why is the "is a close" argument TRUE? */ offset = dissect_nt_policy_hnd( diff --git a/packet-dcerpc-tapi.c b/packet-dcerpc-tapi.c index 9fc6847f2d..359bbfc99c 100644 --- a/packet-dcerpc-tapi.c +++ b/packet-dcerpc-tapi.c @@ -2,7 +2,7 @@ * Routines for DCERPC TAPI packet disassembly * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-tapi.c,v 1.8 2003/10/22 01:55:04 sahlberg Exp $ + * $Id: packet-dcerpc-tapi.c,v 1.9 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -73,7 +73,7 @@ static guint16 ver_dcerpc_tapi = 1; static int dissect_tapi_client_attach_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_tapi_unknown_long, NULL); @@ -91,7 +91,7 @@ dissect_tapi_client_attach_rqst(tvbuff_t *tvb, int offset, static int dissect_tapi_client_attach_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ctx_hnd(tvb, offset, pinfo, tree, drep, hf_tapi_hnd, NULL); @@ -115,7 +115,7 @@ dissect_tapi_client_attach_reply(tvbuff_t *tvb, int offset, static int dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { dcerpc_info *di; @@ -137,7 +137,7 @@ dissect_tapi_TYPE_1(tvbuff_t *tvb, int offset, static int dissect_tapi_client_request_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ctx_hnd(tvb, offset, pinfo, tree, drep, hf_tapi_hnd, NULL); @@ -154,7 +154,7 @@ dissect_tapi_client_request_rqst(tvbuff_t *tvb, int offset, static int dissect_tapi_client_request_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_tapi_rc, NULL); @@ -171,14 +171,14 @@ dissect_tapi_client_request_reply(tvbuff_t *tvb, int offset, static int dissect_tapi_client_detach_rqst(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, - char *drep _U_) + guint8 *drep _U_) { return offset; } static int dissect_tapi_client_detach_reply(tvbuff_t *tvb _U_, int offset _U_, packet_info *pinfo _U_, proto_tree *tree _U_, - char *drep _U_) + guint8 *drep _U_) { return offset; } diff --git a/packet-dcerpc-wkssvc.c b/packet-dcerpc-wkssvc.c index 504f1c0b56..368fed9fde 100644 --- a/packet-dcerpc-wkssvc.c +++ b/packet-dcerpc-wkssvc.c @@ -3,7 +3,7 @@ * Copyright 2001, Tim Potter <tpot@samba.org> * Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com> * - * $Id: packet-dcerpc-wkssvc.c,v 1.30 2004/01/18 06:38:14 sharpe Exp $ + * $Id: packet-dcerpc-wkssvc.c,v 1.31 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -110,7 +110,7 @@ static e_uuid_t uuid_dcerpc_wkssvc = { static int wkssvc_dissect_ENUM_HANDLE(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -133,7 +133,7 @@ static guint16 ver_dcerpc_wkssvc = 1; static int wkssvc_dissect_WKS_INFO_100(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_platform_id, NULL); @@ -166,7 +166,7 @@ wkssvc_dissect_WKS_INFO_100(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_101(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_platform_id, NULL); @@ -203,7 +203,7 @@ wkssvc_dissect_WKS_INFO_101(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_102(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_platform_id, NULL); @@ -236,7 +236,7 @@ wkssvc_dissect_WKS_INFO_102(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_502(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_char_wait, NULL); @@ -349,7 +349,7 @@ wkssvc_dissect_WKS_INFO_502(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1010(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_char_wait, NULL); @@ -360,7 +360,7 @@ wkssvc_dissect_WKS_INFO_1010(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1011(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_collection_time, NULL); @@ -371,7 +371,7 @@ wkssvc_dissect_WKS_INFO_1011(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1012(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_maximum_collection_count, NULL); @@ -382,7 +382,7 @@ wkssvc_dissect_WKS_INFO_1012(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1013(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_keep_conn, NULL); @@ -393,7 +393,7 @@ wkssvc_dissect_WKS_INFO_1013(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1018(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_sess_timeout, NULL); @@ -404,7 +404,7 @@ wkssvc_dissect_WKS_INFO_1018(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1023(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_siz_char_buf, NULL); @@ -415,7 +415,7 @@ wkssvc_dissect_WKS_INFO_1023(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1027(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_errlog_sz, NULL); @@ -426,7 +426,7 @@ wkssvc_dissect_WKS_INFO_1027(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_INFO_1033(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_max_threads, NULL); @@ -444,7 +444,7 @@ wkssvc_dissect_WKS_INFO_1033(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstagetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", @@ -476,7 +476,7 @@ wkssvc_dissect_netwkstagetinfo_rqst(tvbuff_t *tvb, int offset, static int wkssvc_dissect_WKS_GETINFO_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -584,7 +584,7 @@ wkssvc_dissect_WKS_GETINFO_UNION(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstagetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, wkssvc_dissect_WKS_GETINFO_UNION, @@ -607,7 +607,7 @@ static int wkssvc_dissect_netwkstagetinfo_reply(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstasetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", @@ -627,7 +627,7 @@ static int wkssvc_dissect_netwkstasetinfo_rqst(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstasetinfo_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_parm_err, 0); @@ -647,7 +647,7 @@ static int wkssvc_dissect_netwkstasetinfo_reply(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "User Name", @@ -659,7 +659,7 @@ wkssvc_dissect_USER_INFO_0(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, wkssvc_dissect_USER_INFO_0); @@ -676,7 +676,7 @@ wkssvc_dissect_USER_INFO_0_array(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_num_entries, NULL); @@ -699,7 +699,7 @@ wkssvc_dissect_USER_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "User Name", @@ -723,7 +723,7 @@ wkssvc_dissect_USER_INFO_1(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_INFO_1_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, wkssvc_dissect_USER_INFO_1); @@ -740,7 +740,7 @@ wkssvc_dissect_USER_INFO_1_array(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_num_entries, NULL); @@ -761,7 +761,7 @@ wkssvc_dissect_USER_INFO_1_CONTAINER(tvbuff_t *tvb, int offset, static int wkssvc_dissect_USER_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -799,7 +799,7 @@ wkssvc_dissect_USER_ENUM_UNION(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstaenumusers_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", @@ -836,7 +836,7 @@ wkssvc_dissect_netwkstaenumusers_rqst(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstaenumusers_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* There seems to be an info level there first */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, @@ -873,7 +873,7 @@ static int wkssvc_dissect_netwkstaenumusers_reply(tvbuff_t *tvb, int offset, static int wkssvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_quality_of_service, 0); @@ -898,7 +898,7 @@ wkssvc_dissect_TRANSPORT_INFO_0(tvbuff_t *tvb, int offset, static int wkssvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_ucarray(tvb, offset, pinfo, tree, drep, wkssvc_dissect_TRANSPORT_INFO_0); @@ -915,7 +915,7 @@ wkssvc_dissect_TRANSPORT_INFO_0_array(tvbuff_t *tvb, int offset, static int wkssvc_dissect_TRANSPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_wkssvc_num_entries, NULL); @@ -935,7 +935,7 @@ wkssvc_dissect_TRANSPORT_INFO_0_CONTAINER(tvbuff_t *tvb, int offset, static int wkssvc_dissect_TRANSPORT_ENUM_UNION(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { guint32 level; @@ -969,7 +969,7 @@ wkssvc_dissect_TRANSPORT_ENUM_UNION(tvbuff_t *tvb, int offset, static int wkssvc_dissect_netwkstatransportenum_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, NDR_POINTER_UNIQUE, "Server", @@ -997,7 +997,7 @@ static int wkssvc_dissect_netwkstatransportenum_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, - char *drep) + guint8 *drep) { /* There seems to be an info level there first */ offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, diff --git a/packet-dcerpc.c b/packet-dcerpc.c index ef4ec86ab9..5c4cca9e2a 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -3,7 +3,7 @@ * Copyright 2001, Todd Sabin <tas@webspan.net> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc.c,v 1.158 2003/12/08 20:58:01 guy Exp $ + * $Id: packet-dcerpc.c,v 1.159 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -811,7 +811,7 @@ dcerpc_matched_hash (gconstpointer k) int dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint8 *pdata) { guint8 data; @@ -827,7 +827,7 @@ dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint16 *pdata) { guint16 data; @@ -846,7 +846,7 @@ dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata) { guint32 data; @@ -866,7 +866,7 @@ dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, /* handles 32 bit unix time_t */ int dissect_dcerpc_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata) { guint32 data; @@ -889,7 +889,7 @@ dissect_dcerpc_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, unsigned char *pdata) { if(pdata){ @@ -913,7 +913,7 @@ dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_float(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gfloat *pdata) { gfloat data; @@ -947,7 +947,7 @@ dissect_dcerpc_float(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, int dissect_dcerpc_double(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gdouble *pdata) { gdouble data; @@ -983,7 +983,7 @@ dissect_dcerpc_double(tvbuff_t *tvb, gint offset, packet_info *pinfo _U_, * a couple simpler things */ guint16 -dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, char *drep) +dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, guint8 *drep) { if (drep[0] & 0x10) { return tvb_get_letohs (tvb, offset); @@ -993,7 +993,7 @@ dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, char *drep) } guint32 -dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, char *drep) +dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, guint8 *drep) { if (drep[0] & 0x10) { return tvb_get_letohl (tvb, offset); @@ -1003,7 +1003,7 @@ dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, char *drep) } void -dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, char *drep, e_uuid_t *uuid) +dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, guint8 *drep, e_uuid_t *uuid) { unsigned int i; uuid->Data1 = dcerpc_tvb_get_ntohl (tvb, offset, drep); @@ -1021,7 +1021,7 @@ dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, char *drep, e_uuid_t *uuid) /* function to dissect a unidimensional conformant array */ int dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct) { guint32 i; @@ -1053,7 +1053,7 @@ dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* function to dissect a unidimensional conformant and varying array */ int dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct) { guint32 i; @@ -1108,7 +1108,7 @@ dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, varying arrays of bytes. */ int dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di; guint32 len; @@ -1149,7 +1149,7 @@ dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, "dissect_ndr_ucvarray()" does? */ int dissect_ndr_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, int size_is, + proto_tree *tree, guint8 *drep, int size_is, int hfindex, gboolean add_subtree, char **data) { dcerpc_info *di; @@ -1250,7 +1250,7 @@ dissect_ndr_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, (Not that it matters if it is.) */ int dissect_ndr_char_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di; di=pinfo->private_data; @@ -1271,7 +1271,7 @@ dissect_ndr_char_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, (Not that it matters if it is.) */ int dissect_ndr_wchar_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep) + proto_tree *tree, guint8 *drep) { dcerpc_info *di; di=pinfo->private_data; @@ -1327,7 +1327,7 @@ init_ndr_pointer_list(packet_info *pinfo) } static int -dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, char *drep) +dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, guint8 *drep) { int found_new_pointer; dcerpc_info *di; @@ -1513,7 +1513,7 @@ find_pointer_index(guint32 id) */ int dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index, dcerpc_callback_fnct_t *callback, void *callback_args) { @@ -1709,7 +1709,7 @@ after_ref_id: int dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index) { return dissect_ndr_pointer_cb( @@ -1754,7 +1754,7 @@ static int dcerpc_try_handoff (packet_info *pinfo, proto_tree *tree, proto_tree *dcerpc_tree, tvbuff_t *volatile tvb, tvbuff_t *decrypted_tvb, - char *drep, dcerpc_info *info, + guint8 *drep, dcerpc_info *info, dcerpc_auth_info *auth_info) { volatile gint offset = 0; @@ -3181,7 +3181,7 @@ static gboolean dissect_dcerpc_cn (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, gboolean can_desegment, int *pkt_len) { - static char nulls[4] = { 0 }; + static const guint8 nulls[4] = { 0 }; int start_offset; int padding = 0; proto_item *ti = NULL; diff --git a/packet-dcerpc.h b/packet-dcerpc.h index 036fc63ce2..792616c41c 100644 --- a/packet-dcerpc.h +++ b/packet-dcerpc.h @@ -2,7 +2,7 @@ * Copyright 2001, Todd Sabin <tas@webspan.net> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc.h,v 1.38 2003/11/21 02:48:11 guy Exp $ + * $Id: packet-dcerpc.h,v 1.39 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -111,62 +111,62 @@ typedef struct _dcerpc_auth_info { * If you're writing a subdissector, you almost certainly want the * NDR functions below. */ -guint16 dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, char *drep); -guint32 dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, char *drep); -void dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, char *drep, e_uuid_t *uuid); +guint16 dcerpc_tvb_get_ntohs (tvbuff_t *tvb, gint offset, guint8 *drep); +guint32 dcerpc_tvb_get_ntohl (tvbuff_t *tvb, gint offset, guint8 *drep); +void dcerpc_tvb_get_uuid (tvbuff_t *tvb, gint offset, guint8 *drep, e_uuid_t *uuid); int dissect_dcerpc_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint8 *pdata); int dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint16 *pdata); int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata); int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, unsigned char *pdata); int dissect_dcerpc_float (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gfloat *pdata); int dissect_dcerpc_double (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gdouble *pdata); int dissect_dcerpc_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata); /* * NDR routines for subdissectors. */ int dissect_ndr_uint8 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint8 *pdata); int dissect_ndr_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint16 *pdata); int dissect_ndr_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata); int dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, unsigned char *pdata); int dissect_ndr_float (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gfloat *pdata); int dissect_ndr_double (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, gdouble *pdata); int dissect_ndr_time_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, guint32 *pdata); int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, e_uuid_t *pdata); int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, int hfindex, e_ctx_hnd *pdata); -typedef int (dcerpc_dissect_fnct_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep); +typedef int (dcerpc_dissect_fnct_t)(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep); typedef void (dcerpc_callback_fnct_t)(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb, int start_offset, int end_offset, void *callback_args); @@ -175,37 +175,37 @@ typedef void (dcerpc_callback_fnct_t)(packet_info *pinfo, proto_tree *tree, prot #define NDR_POINTER_PTR 3 int dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index, dcerpc_callback_fnct_t *callback, void *callback_args); int dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct, int type, char *text, int hf_index); /* dissect a NDR unidimensional conformant array */ int dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct); /* dissect a NDR unidimensional conformant and varying array */ int dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, + proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct); int dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep); + proto_tree *tree, guint8 *drep); int dissect_ndr_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep, int size_is, + proto_tree *tree, guint8 *drep, int size_is, int hfinfo, gboolean add_subtree, char **data); int dissect_ndr_char_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep); + proto_tree *tree, guint8 *drep); int dissect_ndr_wchar_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep); + proto_tree *tree, guint8 *drep); typedef struct _dcerpc_sub_dissector { guint16 num; diff --git a/packet-gssapi.c b/packet-gssapi.c index 643cbb1069..9b86fa3e6c 100644 --- a/packet-gssapi.c +++ b/packet-gssapi.c @@ -4,7 +4,7 @@ * Copyright 2002, Richard Sharpe <rsharpe@samba.org> Added a few * bits and pieces ... * - * $Id: packet-gssapi.c,v 1.28 2003/11/16 23:17:19 guy Exp $ + * $Id: packet-gssapi.c,v 1.29 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -436,7 +436,7 @@ proto_register_gssapi(void) static int wrap_dissect_gssapi(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { tvbuff_t *auth_tvb; @@ -451,7 +451,7 @@ static int wrap_dissect_gssapi(tvbuff_t *tvb, int offset, static int wrap_dissect_gssapi_verf(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { tvbuff_t *auth_tvb; diff --git a/packet-ntlmssp.c b/packet-ntlmssp.c index 3d7c5ef62a..0538692dce 100644 --- a/packet-ntlmssp.c +++ b/packet-ntlmssp.c @@ -3,7 +3,7 @@ * Devin Heitmueller <dheitmueller@netilla.com> * Copyright 2003, Tim Potter <tpot@samba.org> * - * $Id: packet-ntlmssp.c,v 1.45 2003/09/26 06:30:13 tpot Exp $ + * $Id: packet-ntlmssp.c,v 1.46 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1534,7 +1534,7 @@ proto_register_ntlmssp(void) } static int wrap_dissect_ntlmssp(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { tvbuff_t *auth_tvb; @@ -1548,7 +1548,7 @@ static int wrap_dissect_ntlmssp(tvbuff_t *tvb, int offset, packet_info *pinfo, } static int wrap_dissect_ntlmssp_verf(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, char *drep _U_) + proto_tree *tree, guint8 *drep _U_) { tvbuff_t *auth_tvb; diff --git a/packet-smb-browse.c b/packet-smb-browse.c index 85c38e3d9a..d5c78339e3 100644 --- a/packet-smb-browse.c +++ b/packet-smb-browse.c @@ -2,7 +2,7 @@ * Routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-browse.c,v 1.35 2004/01/10 02:43:28 guy Exp $ + * $Id: packet-smb-browse.c,v 1.36 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -463,7 +463,7 @@ dissect_election_criterion(tvbuff_t *tvb, proto_tree *parent_tree, int offset) */ int dissect_smb_server_type_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep, + proto_tree *parent_tree, guint8 *drep, gboolean infoflag) { proto_tree *tree = NULL; @@ -570,8 +570,8 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr proto_tree *tree = NULL; proto_item *item = NULL; guint32 periodicity; - char host_name[17]; - guint namelen; + guint8 host_name[17]; + gint namelen; guint8 server_count, reset_cmd; int i; guint32 uptime; @@ -680,7 +680,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr break; } case BROWSE_REQUEST_ANNOUNCE: { - char *computer_name; + guint8 *computer_name; /* unused/unknown flags */ proto_tree_add_item(tree, hf_unused_flags, @@ -819,7 +819,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr proto_tree *tree = NULL; proto_item *item = NULL; guint32 periodicity; - const char *host_name; + const guint8 *host_name; guint namelen; if (check_col(pinfo->cinfo, COL_PROTOCOL)) { diff --git a/packet-smb-browse.h b/packet-smb-browse.h index 136668347e..94bf48bd09 100644 --- a/packet-smb-browse.h +++ b/packet-smb-browse.h @@ -2,7 +2,7 @@ * Declaration of routines for SMB Browser packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-browse.h,v 1.7 2003/11/16 23:17:21 guy Exp $ + * $Id: packet-smb-browse.h,v 1.8 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -28,7 +28,7 @@ int dissect_smb_server_type_flags(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep, + proto_tree *parent_tree, guint8 *drep, gboolean infoflag); #endif diff --git a/packet-smb-common.h b/packet-smb-common.h index 04a4dba43c..af9b8d3140 100644 --- a/packet-smb-common.h +++ b/packet-smb-common.h @@ -2,7 +2,7 @@ * Routines for SMB packet dissection * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-smb-common.h,v 1.25 2004/01/10 02:43:28 guy Exp $ + * $Id: packet-smb-common.h,v 1.26 2004/01/19 20:10:36 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -91,12 +91,12 @@ struct access_mask_info { int dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, guint8 *drep, int hfindex, struct access_mask_info *ami); int dissect_nt_sec_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep, int len, + proto_tree *parent_tree, guint8 *drep, int len, struct access_mask_info *ami); extern const value_string share_type_vals[]; diff --git a/packet-smb.c b/packet-smb.c index f03fa7a556..9a6c15a2ea 100644 --- a/packet-smb.c +++ b/packet-smb.c @@ -3,7 +3,7 @@ * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com> * 2001 Rewrite by Ronnie Sahlberg and Guy Harris * - * $Id: packet-smb.c,v 1.384 2004/01/10 02:43:28 guy Exp $ + * $Id: packet-smb.c,v 1.385 2004/01/19 20:10:37 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -4742,7 +4742,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_item *litem = NULL; proto_tree *ltree = NULL; if(lt&0x10){ - char buf[8]; + guint8 buf[8]; guint32 val; /* large lock format */ @@ -4826,7 +4826,7 @@ dissect_locking_andx_request(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * proto_item *litem = NULL; proto_tree *ltree = NULL; if(lt&0x10){ - char buf[8]; + guint8 buf[8]; guint32 val; /* large lock format */ @@ -7460,7 +7460,7 @@ static void map_standard_access(guint32 *access_mask, int dissect_nt_access_mask(tvbuff_t *tvb, gint offset, packet_info *pinfo, - proto_tree *tree, char *drep, int hfindex, + proto_tree *tree, guint8 *drep, int hfindex, struct access_mask_info *ami) { proto_item *item; @@ -7670,7 +7670,7 @@ static int hf_smb_access_mask = -1; static int dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep, + proto_tree *parent_tree, guint8 *drep, struct access_mask_info *ami) { proto_item *item = NULL; @@ -7724,7 +7724,7 @@ dissect_nt_v2_ace(tvbuff_t *tvb, int offset, packet_info *pinfo, static int dissect_nt_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep, char *name, + proto_tree *parent_tree, guint8 *drep, char *name, struct access_mask_info *ami) { proto_item *item = NULL; @@ -7870,7 +7870,7 @@ dissect_nt_sec_desc_type(tvbuff_t *tvb, int offset, proto_tree *parent_tree) int dissect_nt_sec_desc(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *parent_tree, char *drep, int len, + proto_tree *parent_tree, guint8 *drep, int len, struct access_mask_info *ami) { proto_item *item = NULL; @@ -13503,7 +13503,7 @@ dissect_qfsi_vals(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, e_uuid_t fs_id; char uuid_str[DCERPC_UUID_STR_LEN]; int uuid_str_len; - char drep = 0x10; + guint8 drep = 0x10; CHECK_BYTE_COUNT_TRANS_SUBR(16); |