diff options
author | Guy Harris <guy@alum.mit.edu> | 2002-01-29 09:13:28 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2002-01-29 09:13:28 +0000 |
commit | d5df5579236136b73890f72e881999d487acab37 (patch) | |
tree | 06b5bc0023f595fed9ed08e186d0f141b494a90f /packet-dcerpc.h | |
parent | 5cf3587feba3e8d0a897d6a88ac8685cea5837b3 (diff) |
DCE RPC enhancements, and SAMR improvements, from Ronnie Sahlberg.
svn path=/trunk/; revision=4618
Diffstat (limited to 'packet-dcerpc.h')
-rw-r--r-- | packet-dcerpc.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/packet-dcerpc.h b/packet-dcerpc.h index 92ec7e100c..941a686836 100644 --- a/packet-dcerpc.h +++ b/packet-dcerpc.h @@ -1,7 +1,7 @@ /* packet-dcerpc.h * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc.h,v 1.9 2002/01/25 08:35:59 guy Exp $ + * $Id: packet-dcerpc.h,v 1.10 2002/01/29 09:13:28 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -107,6 +107,9 @@ int dissect_dcerpc_uint16 (tvbuff_t *tvb, gint offset, packet_info *pinfo, int dissect_dcerpc_uint32 (tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, char *drep, int hfindex, guint32 *pdata); +int dissect_dcerpc_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, + proto_tree *tree, char *drep, + int hfindex, unsigned char *pdata); /* @@ -121,6 +124,9 @@ int 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, int hfindex, guint32 *pdata); +int dissect_ndr_uint64 (tvbuff_t *tvb, gint offset, packet_info *pinfo, + proto_tree *tree, char *drep, + int hfindex, unsigned char *pdata); int dissect_ndr_uuid_t (tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, char *drep, int hfindex, e_uuid_t *pdata); @@ -143,6 +149,12 @@ int dissect_ndr_ucarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, char *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, + dcerpc_dissect_fnct_t *fnct); + + typedef struct _dcerpc_sub_dissector { guint16 num; @@ -186,6 +198,10 @@ typedef struct _dcerpc_info { guint32 call_id; /* Context id for this call */ guint16 smb_fid; /* FID for DCERPC over SMB */ gboolean request; + gboolean conformant_run; + guint32 array_max_count; /* max_count for conformant arrays */ + guint32 array_offset; + guint32 array_actual_count; int hf_index; dcerpc_call_value *call_data; } dcerpc_info; |