osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

char *drep -> guint8 *drep 

svn path=/trunk/; revision=9735
This commit is contained in:
Jörg Mayer 2004-01-19 20:10:37 +00:00
parent 6f6fc13e5b
commit 3e2633a0f4
36 changed files with 1318 additions and 1318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packet-dcerpc-atsvc.c
View File

@ -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,

84
packet-dcerpc-browser.c
View File

@ -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,

10
packet-dcerpc-conv.c
View File

@ -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,

44
packet-dcerpc-epm.c
View File

@ -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,

44
packet-dcerpc-epm4.c
View File

@ -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,

14
packet-dcerpc-initshutdown.c
View File

@ -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(

6
packet-dcerpc-krb5rpc.c
View File

@ -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;

14
packet-dcerpc-lsa-ds.c
View File

@ -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,

364
packet-dcerpc-lsa.c
View File

File diff suppressed because it is too large Load Diff

10
packet-dcerpc-lsa.h
View File

@ -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 */

16
packet-dcerpc-mapi.c
View File

@ -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);

6
packet-dcerpc-messenger.c
View File

@ -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);

20
packet-dcerpc-ndr.c
View File

@ -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;

382
packet-dcerpc-netlogon.c
View File

File diff suppressed because it is too large Load Diff

32
packet-dcerpc-nt.c
View File

@ -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(

48
packet-dcerpc-nt.h
View File

@ -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);
/*

4
packet-dcerpc-oxid.c
View File

@ -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;

66
packet-dcerpc-reg.c
View File

@ -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;

4
packet-dcerpc-rpriv.c
View File

@ -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,

6
packet-dcerpc-rs_acct.c
View File

@ -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;

4
packet-dcerpc-rs_misc.c
View File

@ -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;

10
packet-dcerpc-rs_pgo.c
View File

@ -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;

406
packet-dcerpc-samr.c
View File

File diff suppressed because it is too large Load Diff

252
packet-dcerpc-spoolss.c
View File

File diff suppressed because it is too large Load Diff

496
packet-dcerpc-srvsvc.c
View File

File diff suppressed because it is too large Load Diff

28
packet-dcerpc-svcctl.c
View File

@ -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(

16
packet-dcerpc-tapi.c
View File

@ -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;
}

68
packet-dcerpc-wkssvc.c
View File

@ -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,

44
packet-dcerpc.c
View File

@ -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;

58
packet-dcerpc.h
View File

@ -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;

6
packet-gssapi.c
View File

@ -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;

6
packet-ntlmssp.c
View File

@ -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;

12
packet-smb-browse.c
View File

@ -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)) {

4
packet-smb-browse.h
View File

@ -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

6
packet-smb-common.h
View File

@ -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[];

16
packet-smb.c
View File

@ -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);