aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-multipart.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2014-11-22 18:17:20 -0500
committerAnders Broman <a.broman58@gmail.com>2014-11-25 07:26:56 +0000
commita600ef6d5993ab8cab79e11e3e6a1218260e44c2 (patch)
tree09b89b8280f20f875e2007a497cea75b1d2e9813 /epan/dissectors/packet-multipart.c
parent518bb10d90e57fceef5a03eda7a4eab84aca1f07 (diff)
Have media dissector take its "media type parameter" from dissector data parameter instead of pinfo->private_data.
Change-Id: I0a0cb0b4838bc4e55a759fb6031355892c220c8e Reviewed-on: https://code.wireshark.org/review/5461 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-multipart.c')
-rw-r--r--epan/dissectors/packet-multipart.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index 4e6c20b2e8..c01722e3c9 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -741,7 +741,7 @@ process_body_part(proto_tree *tree, tvbuff_t *tvb, const guint8 *boundary,
if (! dissected) {
const char *save_match_string = pinfo->match_string;
pinfo->match_string = content_type_str;
- call_dissector(media_handle, tmp_tvb, pinfo, subtree);
+ call_dissector_with_data(media_handle, tmp_tvb, pinfo, subtree, parameters);
pinfo->match_string = save_match_string;
}
pinfo->private_data = save_private_data;