diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-31 00:57:03 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-31 00:57:03 +0000 |
| commit | c0fcebb07a7246ba9c0dc565f3a8c32078d9bf0b (patch) | |
| tree | 875db1141d2ded7f0724ff7b8476d72e0d01454c /epan/dissectors/packet-pres.c | |
| parent | 0de68078c0f15a16d4fd3f5ce4b4365d66945af4 (diff) | |
| download | wireshark-c0fcebb07a7246ba9c0dc565f3a8c32078d9bf0b.tar.gz | |
Add a data parameter to call_ber_oid_callback to be able to pass data to subdissectors found with dissector_try_string_new.
The intention is to aid in the removal of pinfo->private_data use as well as static global variables in a dissector. For now, all calls to call_ber_oid_callback have the data parameter set to NULL.
svn path=/trunk/; revision=52994
Diffstat (limited to 'epan/dissectors/packet-pres.c')
| -rw-r--r-- | epan/dissectors/packet-pres.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index fc1283b737..45a043f736 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -642,7 +642,7 @@ dissect_pres_T_single_ASN1_type(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ next_tvb = tvb_new_subset_remaining(tvb, offset); - call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree); + call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree, NULL); } else { proto_tree_add_expert(tree, actx->pinfo, &ei_pres_dissector_not_available, tvb, offset, -1); @@ -665,7 +665,7 @@ dissect_pres_T_octet_aligned(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o oid=find_oid_by_pres_ctx_id(actx->pinfo, presentation_context_identifier); if(oid){ dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, &next_tvb); - call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree); + call_ber_oid_callback(oid, next_tvb, offset, actx->pinfo, global_tree, NULL); } else { proto_tree_add_expert(tree, actx->pinfo, &ei_pres_dissector_not_available, tvb, offset, -1); @@ -1484,7 +1484,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* This is a reassembly initiated in packet-ses */ char *oid = find_oid_by_pres_ctx_id (pinfo, session->pres_ctx_id); if (oid) { - call_ber_oid_callback (oid, tvb, offset, pinfo, parent_tree); + call_ber_oid_callback (oid, tvb, offset, pinfo, parent_tree, NULL); } else { proto_tree_add_text(parent_tree, tvb, offset, tvb_reported_length_remaining(tvb,offset),"User data"); |