aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-sip.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2013-11-02 15:52:25 +0000
committerMichael Mann <mmann78@netscape.net>2013-11-02 15:52:25 +0000
commit02a83915359f7fadf149df0fe0dea8e971bb32f4 (patch)
tree33b0da2fee3eed9a07417a0aa7e4c2356638cd33 /epan/dissectors/packet-sip.c
parent925cba4e91ea0f44970462d30b62533c8a100e24 (diff)
Require dissector_try_string to pass a data parameter to its subdissectors. There weren't that many calls, so might as well modify the function than create a need for dissector_try_string_new.
svn path=/trunk/; revision=53049
Diffstat (limited to 'epan/dissectors/packet-sip.c')
-rw-r--r--epan/dissectors/packet-sip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index bb711bb9d0..e6fddb474c 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -2387,7 +2387,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
if (ext_hdr_handle != NULL) {
tvbuff_t *next_tvb2;
next_tvb2 = tvb_new_subset(tvb, value_offset, value_len, value_len);
- dissector_try_string(ext_hdr_subdissector_table, header_name, next_tvb2, pinfo, proto_item_add_subtree(ti_c, ett_sip_ext_hdr));
+ dissector_try_string(ext_hdr_subdissector_table, header_name, next_tvb2, pinfo, proto_item_add_subtree(ti_c, ett_sip_ext_hdr), NULL);
} else {
expert_add_info_format(pinfo, ti_c, &ei_sip_unrecognized_header,
"Unrecognised SIP header (%s)",
@@ -3229,14 +3229,14 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
found_match = dissector_try_string(media_type_dissector_table,
media_type_str_lower_case,
next_tvb, pinfo,
- message_body_tree);
+ message_body_tree, NULL);
if (!found_match &&
!strncmp(media_type_str_lower_case, "multipart/", sizeof("multipart/")-1)) {
/* Try to decode the unknown multipart subtype anyway */
found_match = dissector_try_string(media_type_dissector_table,
"multipart/",
next_tvb, pinfo,
- message_body_tree);
+ message_body_tree, NULL);
}
pinfo->private_data = save_private_data;
/* If no match dump as text */