diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-22 18:17:20 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-11-25 07:26:56 +0000 |
| commit | a600ef6d5993ab8cab79e11e3e6a1218260e44c2 (patch) | |
| tree | 09b89b8280f20f875e2007a497cea75b1d2e9813 /epan/dissectors/packet-spdy.c | |
| parent | 518bb10d90e57fceef5a03eda7a4eab84aca1f07 (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-spdy.c')
| -rw-r--r-- | epan/dissectors/packet-spdy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index f773331ed0..b6987f0f58 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -751,6 +751,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, gboolean private_data_changed = FALSE; gboolean is_single_chunk = FALSE; gboolean have_entire_body; + char *media_str = NULL; /* * Create a tvbuff for the payload. @@ -908,6 +909,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, if (si->content_type_parameters) { pinfo->private_data = wmem_strdup(wmem_packet_scope(), si->content_type_parameters); + media_str = (char*)pinfo->private_data; } else { pinfo->private_data = NULL; } @@ -934,7 +936,7 @@ static int dissect_spdy_data_payload(tvbuff_t *tvb, * Calling the default media handle if there is a content-type that * wasn't handled above. */ - call_dissector(media_handle, next_tvb, pinfo, spdy_tree); + call_dissector_with_data(media_handle, next_tvb, pinfo, spdy_tree, media_str); } else { /* Call the default data dissector */ call_dissector(data_handle, next_tvb, pinfo, spdy_tree); |