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 /asn1/p1/p1.cnf | |
| parent | 0de68078c0f15a16d4fd3f5ce4b4365d66945af4 (diff) | |
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 'asn1/p1/p1.cnf')
| -rw-r--r-- | asn1/p1/p1.cnf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 9d10e867be..6e24dc8ba2 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -549,7 +549,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" expert_add_info(actx->pinfo, item, &ei_p1_unknown_standard_extension); } } else if (actx->external.direct_ref_present) { - offset = call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); name = oid_resolved_from_string(actx->external.direct_reference); proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); } @@ -562,7 +562,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" const char *name; if (actx->external.direct_reference) { - offset = call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); + offset = call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); name = oid_resolved_from_string(actx->external.direct_reference); proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference); } else { @@ -673,7 +673,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" if (next_tvb) { if (ctx && ctx->content_type_id) { - (void) call_ber_oid_callback(ctx->content_type_id, next_tvb, 0, actx->pinfo, actx->subtree.top_tree ? actx->subtree.top_tree : tree); + (void) call_ber_oid_callback(ctx->content_type_id, next_tvb, 0, actx->pinfo, actx->subtree.top_tree ? actx->subtree.top_tree : tree, NULL); } else if (ctx && ctx->report_unknown_content_type) { proto_item *item = NULL; proto_tree *next_tree = NULL; @@ -1153,7 +1153,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" #.FN_BODY TokenTypeData if(actx->external.direct_reference) - call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); + call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL); #.FN_PARS Credentials VAL_PTR = &credentials |