diff options
| author | Tim Potter <tpot@samba.org> | 2003-02-03 02:14:01 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-02-03 02:14:01 +0000 |
| commit | 6b8a47a691746fb4d6c52122be40e840d05335ac (patch) | |
| tree | 660160bc2b3b8747b35bbff282352792fec86c1a /packet-dcerpc-srvsvc.c | |
| parent | 91c6b0c70b698c3a41cf9d4f9e5e38064bb3d387 (diff) | |
| download | wireshark-6b8a47a691746fb4d6c52122be40e840d05335ac.tar.gz wireshark-6b8a47a691746fb4d6c52122be40e840d05335ac.tar.bz2 wireshark-6b8a47a691746fb4d6c52122be40e840d05335ac.zip | |
Convert to new DCERPC string handling functions. There are still some
cosmetic bugs to work out though.
svn path=/trunk/; revision=7069
Diffstat (limited to 'packet-dcerpc-srvsvc.c')
| -rw-r--r-- | packet-dcerpc-srvsvc.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/packet-dcerpc-srvsvc.c b/packet-dcerpc-srvsvc.c index 67a1cecf2b..84954cbc0f 100644 --- a/packet-dcerpc-srvsvc.c +++ b/packet-dcerpc-srvsvc.c @@ -9,7 +9,7 @@ * 2002, some share information levels implemented based on samba * sources. * - * $Id: packet-dcerpc-srvsvc.c,v 1.49 2003/01/31 06:24:50 guy Exp $ + * $Id: packet-dcerpc-srvsvc.c,v 1.50 2003/02/03 02:14:01 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2945,11 +2945,17 @@ srvsvc_dissect_netrsharegetinfo_rqst(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *drep) { - offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, - NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, 0); + offset = dissect_ndr_pointer_cb( + tvb, offset, pinfo, tree, drep, + dissect_ndr_wchar_array, NDR_POINTER_UNIQUE, + "Server", hf_srvsvc_server, cb_str_postprocess, + GINT_TO_POINTER(CB_STR_COL_INFO | 1)); - offset = dissect_ndr_str_pointer_item(tvb, offset, pinfo, tree, drep, - NDR_POINTER_REF, "Share", hf_srvsvc_share, 0); + offset = dissect_ndr_pointer_cb( + tvb, offset, pinfo, tree, drep, + dissect_ndr_wchar_array, NDR_POINTER_REF, + "Share", hf_srvsvc_share, cb_str_postprocess, + GINT_TO_POINTER(CB_STR_COL_INFO | 1)); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_srvsvc_info_level, 0); @@ -5288,7 +5294,7 @@ srvsvc_dissect_netrservergetinfo_rqst(tvbuff_t *tvb, int offset, { offset = dissect_ndr_pointer_cb( tvb, offset, pinfo, tree, drep, - dissect_ndr_nt_UNICODE_STRING_str, NDR_POINTER_UNIQUE, + dissect_ndr_wchar_array, NDR_POINTER_UNIQUE, "Server", hf_srvsvc_server, cb_str_postprocess, GINT_TO_POINTER(CB_STR_COL_INFO | 1)); |