aboutsummaryrefslogtreecommitdiffstats
path: root/packet-dcerpc-mapi.c
diff options
context:
space:
mode:
authortpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7>2003-02-03 02:14:01 +0000
committertpot <tpot@f5534014-38df-0310-8fa8-9805f1628bb7>2003-02-03 02:14:01 +0000
commit06ca5c27bde7aa78ac081c670be004155643b54f (patch)
tree660160bc2b3b8747b35bbff282352792fec86c1a /packet-dcerpc-mapi.c
parentf3e7788102dd8d3ff7cd5bbabd95b6f2c7902e3a (diff)
Convert to new DCERPC string handling functions. There are still some
cosmetic bugs to work out though. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7069 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-dcerpc-mapi.c')
-rw-r--r--packet-dcerpc-mapi.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c
index f0747da06e..6369fa1dec 100644
--- a/packet-dcerpc-mapi.c
+++ b/packet-dcerpc-mapi.c
@@ -2,7 +2,7 @@
* Routines for MS Exchange MAPI
* Copyright 2002, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-mapi.c,v 1.16 2003/01/28 23:56:38 guy Exp $
+ * $Id: packet-dcerpc-mapi.c,v 1.17 2003/02/03 02:14:00 tpot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -237,7 +237,7 @@ mapi_logon_rqst(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, char *drep)
{
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- dissect_ndr_nt_STRING_string, NDR_POINTER_REF,
+ dissect_ndr_wchar_array, NDR_POINTER_REF,
"unknown string", hf_mapi_unknown_string);
DISSECT_UNKNOWN(tvb_length_remaining(tvb, offset));
@@ -258,13 +258,13 @@ mapi_logon_reply(tvbuff_t *tvb, int offset,
DISSECT_UNKNOWN(20); /* this is 20 bytes, unless there are pointers */
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- dissect_ndr_nt_STRING_string, NDR_POINTER_REF,
+ dissect_ndr_wchar_array, NDR_POINTER_REF,
"unknown string", hf_mapi_unknown_string);
DISSECT_UNKNOWN(6); /* possibly 1 or 2 bytes padding here */
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- dissect_ndr_nt_STRING_string, NDR_POINTER_REF,
+ dissect_ndr_wchar_array, NDR_POINTER_REF,
"unknown string", hf_mapi_unknown_string);
DISSECT_UNKNOWN( tvb_length_remaining(tvb, offset)-4 );
@@ -286,7 +286,7 @@ mapi_unknown_02_request(tvbuff_t *tvb, int offset,
/* this is a unidimensional varying and conformant array of
encrypted data */
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- dissect_ndr_nt_STRING_string, NDR_POINTER_REF,
+ dissect_ndr_wchar_array, NDR_POINTER_REF,
"unknown data", hf_mapi_unknown_data);
} else {
offset = mapi_decrypt_pdu(tvb, offset, pinfo, tree, drep);
@@ -312,7 +312,7 @@ mapi_unknown_02_reply(tvbuff_t *tvb, int offset,
/* this is a unidimensional varying and conformant array of
encrypted data */
offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
- dissect_ndr_nt_STRING_string, NDR_POINTER_REF,
+ dissect_ndr_wchar_array, NDR_POINTER_REF,
"unknown data", hf_mapi_unknown_data);
} else {
offset = mapi_decrypt_pdu(tvb, offset, pinfo, tree, drep);