diff options
author | Michael Mann <mmann78@netscape.net> | 2013-10-21 18:33:14 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-10-21 18:33:14 +0000 |
commit | 772fb97f76177a6f7ee5acb165768ed7506931ae (patch) | |
tree | eb4580c645909b79ed9c17e1297f0def9b73b8ab | |
parent | ac7caf7007ffa128b859f9c8d7e3e2a33adca7ae (diff) |
We can't really have conformant strings they are always conformant and
varying but pidl insists on having a different function. Bug 9306 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9306)
From Matthieu Patou.
svn path=/trunk/; revision=52742
-rw-r--r-- | epan/dissectors/packet-dcerpc.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc.h | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 9b79b30b45..a04ebe2da6 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -1732,6 +1732,14 @@ dissect_ndr_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, return offset; } +int +dissect_ndr_cstring(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, guint8 *drep, int size_is, + int hfindex, gboolean add_subtree, char **data) +{ + return dissect_ndr_cvstring(tvb, offset, pinfo, tree, drep, size_is, hfindex, add_subtree, data); +} + /* Dissect an conformant varying string of chars. This corresponds to IDL of the form '[string] char *foo'. diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h index a8cf2756a4..83e230c923 100644 --- a/epan/dissectors/packet-dcerpc.h +++ b/epan/dissectors/packet-dcerpc.h @@ -284,7 +284,10 @@ int dissect_ndr_wchar_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep); int PIDL_dissect_cvstring(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int chsize, int hfindex, guint32 param); -int dissect_ndr_vstring(tvbuff_t *tvb, int offset, packet_info *pinfo, +int dissect_ndr_cstring(tvbuff_t *tvb, int offset, packet_info *pinfo, + proto_tree *tree, guint8 *drep, int size_is, + int hfindex, gboolean add_subtree, char **data); +int dissect_ndr_vstring(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, guint8 *drep, int size_is, int hfinfo, gboolean add_subtree, char **data); |