diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-03 02:45:22 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-03 02:45:22 +0000 |
| commit | 60e3e52a5329ca1b7559a18146f745254b24d7cd (patch) | |
| tree | 972474395810c1d9b3389a1a7baa5c749e3243cc /asn1/h225 | |
| parent | 3b7f6f0e5f5abf75a944b49745441a9565e70c0a (diff) | |
Have asn1_ctx_t passed into the "h245.gef.name" and "h245.gef.content" subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=53055
Diffstat (limited to 'asn1/h225')
| -rw-r--r-- | asn1/h225/h225.cnf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 57bf82d86e..f5bc55c043 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -673,8 +673,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode gefx = gef_ctx_get(actx->private_data); if (gefx) { /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %s", gefx->key);*/ - actx->pinfo->private_data = actx; - dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset(tvb, offset>>3, 0, 0), actx->pinfo, tree, NULL); + dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset(tvb, offset>>3, 0, 0), actx->pinfo, tree, actx); } actx->private_data = gefx; /* subdissector could overwrite it */ #.END @@ -706,7 +705,7 @@ H221NonStandard/manufacturerCode VAL_PTR = &manufacturerCode gefx = gef_ctx_get(actx->private_data); if (gefx) { /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %%s", gefx->key);*/ - dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, %(ACTX)s); } #.END |