diff options
| author | Tim Potter <tpot@samba.org> | 2003-01-28 06:39:41 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-01-28 06:39:41 +0000 |
| commit | 1d6acba45c87ca6a0ff402f6dbe2493c3d145f41 (patch) | |
| tree | 61210257b47aa160f915efa7d7d343201eab62ae /packet-dcerpc-mapi.c | |
| parent | 6114714a5c3563140915a53b560200f3ca174b6c (diff) | |
Convert dissector to callback based version of dissect_ndr_pointer().
Strings that used to call with levels != -1 should call the
callback helper which will append the string to the pointer item.
svn path=/trunk/; revision=7017
Diffstat (limited to 'packet-dcerpc-mapi.c')
| -rw-r--r-- | packet-dcerpc-mapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c index ce21b26f48..6ecf864d16 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.14 2002/11/28 03:57:50 guy Exp $ + * $Id: packet-dcerpc-mapi.c,v 1.15 2003/01/28 06:39:40 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -238,7 +238,7 @@ mapi_logon_rqst(tvbuff_t *tvb, int offset, { offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_STRING_string, NDR_POINTER_REF, - "unknown string", hf_mapi_unknown_string, -1); + "unknown string", hf_mapi_unknown_string); DISSECT_UNKNOWN(tvb_length_remaining(tvb, offset)); @@ -259,13 +259,13 @@ mapi_logon_reply(tvbuff_t *tvb, int offset, offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_STRING_string, NDR_POINTER_REF, - "unknown string", hf_mapi_unknown_string, -1); + "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, - "unknown string", hf_mapi_unknown_string, -1); + "unknown string", hf_mapi_unknown_string); DISSECT_UNKNOWN( tvb_length_remaining(tvb, offset)-4 ); @@ -287,7 +287,7 @@ mapi_unknown_02_request(tvbuff_t *tvb, int offset, encrypted data */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_STRING_string, NDR_POINTER_REF, - "unknown data", hf_mapi_unknown_data, -1); + "unknown data", hf_mapi_unknown_data); } else { offset = mapi_decrypt_pdu(tvb, offset, pinfo, tree, drep); } @@ -313,7 +313,7 @@ mapi_unknown_02_reply(tvbuff_t *tvb, int offset, encrypted data */ offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep, dissect_ndr_nt_STRING_string, NDR_POINTER_REF, - "unknown data", hf_mapi_unknown_data, -1); + "unknown data", hf_mapi_unknown_data); } else { offset = mapi_decrypt_pdu(tvb, offset, pinfo, tree, drep); } |