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.

svn path=/trunk/; revision=7091

1 files changed, 2 insertions, 14 deletions

diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h
index c502565522..3dcb92fba2 100644
--- a/packet-dcerpc-nt.h
+++ b/packet-dcerpc-nt.h
@@ -2,7 +2,7 @@
  * Routines for DCERPC over SMB packet disassembly
  * Copyright 2001-2003 Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-nt.h,v 1.39 2003/02/07 06:01:49 tpot Exp $
+ * $Id: packet-dcerpc-nt.h,v 1.40 2003/02/07 08:56:11 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -24,17 +24,13 @@
  */
 
 #ifndef __PACKET_DCERPC_NT_H
-#define __PACKET_DCEPRC_NT_H
+#define __PACKET_DCERPC_NT_H
 
 /*
  * ett_ value for Unicode strings.
  */
 extern gint ett_nt_unicode_string;
 
-/* Parse some common RPC structures */
-
-char *fake_unicode(tvbuff_t *tvb, int offset, int len);
-
 /* Routines for handling deferral of referants in NDR */
 
 #define ALIGN_TO_4_BYTES \
@@ -193,12 +189,4 @@ void cb_str_postprocess(packet_info *pinfo, proto_tree *tree _U_,
 
 void dcerpc_smb_init(int proto_dcerpc);
 
-int
-dissect_ndr_wchar_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
-			proto_tree *tree, char *drep);
-
-int
-dissect_ndr_char_array(tvbuff_t *tvb, int offset, packet_info *pinfo, 
-		       proto_tree *tree, char *drep);
-
 #endif /* packet-dcerpc-nt.h */