diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-02-07 08:56:12 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-02-07 08:56:12 +0000 |
| commit | 534a5d9e3b71a615004fc8dfc35708e1061e2a79 (patch) | |
| tree | 8dd469ee14d41ae2f3e23eb0fd2e238902d2b5a3 /packet-dcerpc.h | |
| parent | ef2df2425c76a55425765d073207dbfc77b9d61e (diff) | |
Fix a typo in the multiple-include protection in "packet-dcerpc-nt.h".
Rename "dissect_ndr_element_array()" to "dissect_ndr_character_array()",
move it out of "packet-dcerpc-nt.c" to "packet-dcerpc.c", and have it
use the standard DCE RPC array max count/offset/count fields rather than
their own private versions of those fields. Give it an option to create
a subtree, and an argument to specify the field to use for the actual
data buffer, and export it.
Move the routines for handling arrays of "char" and "wchar" as strings
out of "packet-dcerpc-nt.c" to "packet-dcerpc.c".
Add a routine to handle an array of "char" as an opaque blob of bytes.
Use "dissect_ndr_character_array()" to dissect character strings in MAPI
(the strings in question are ASCII, not Unicode), and use the routine to
handle an array of "char" as an opaque blob of bytes to dissect
encrypted data (again, it's bytes, not 16-bit quantities). Show them as
encrypted data, not unknown data.
Use "dissect_ndr_character_array()" to dissect a form name in
"dissect_form_name()" in the SPOOLSS dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7091 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-dcerpc.h')
| -rw-r--r-- | packet-dcerpc.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/packet-dcerpc.h b/packet-dcerpc.h index af26b9c908..a11b8d744a 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.26 2003/01/28 06:17:09 tpot Exp $ + * $Id: packet-dcerpc.h,v 1.27 2003/02/07 08:56:12 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -159,7 +159,6 @@ int dissect_ndr_ctx_hnd (tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, char *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 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); @@ -189,7 +188,18 @@ int dissect_ndr_ucvarray(tvbuff_t *tvb, gint offset, packet_info *pinfo, proto_tree *tree, char *drep, dcerpc_dissect_fnct_t *fnct); +int dissect_ndr_byte_array(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, char *drep); + +char *fake_unicode(tvbuff_t *tvb, int offset, int len); +int dissect_ndr_character_array(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, char *drep, int size_is, + int hfinfo, gboolean add_subtree); +int dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, char *drep); +int dissect_ndr_wchar_array(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, char *drep); typedef struct _dcerpc_sub_dissector { guint16 num; |