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-jxta.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-jxta.c')
| -rw-r--r-- | epan/dissectors/packet-jxta.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index c89962e34c..d73d796f03 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -2050,10 +2050,12 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf gchar *parms_at = strchr(mediatype, ';'); const char *save_match_string = pinfo->match_string; void * save_private_data = pinfo->private_data; + char *media_str = NULL; /* Based upon what is done in packet-media.c we set up type and params */ if (NULL != parms_at) { pinfo->private_data = wmem_strdup( wmem_packet_scope(), parms_at + 1 ); + media_str = (char*)pinfo->private_data; *parms_at = '\0'; } else { pinfo->private_data = NULL; @@ -2094,7 +2096,7 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf } if (0 == dissected) { - dissected = call_dissector(media_handle, tvb, pinfo, tree); + dissected = call_dissector_with_data(media_handle, tvb, pinfo, tree, media_str); } pinfo->match_string = save_match_string; |