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/h245 | |
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/h245')
-rw-r--r-- | asn1/h245/h245.cnf | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 23d8cf070d..5993b4dd6c 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -698,7 +698,7 @@ if (h245_pi != NULL) 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_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); } actx->private_data = parent_gefx; #.END @@ -720,8 +720,7 @@ if (h245_pi != NULL) 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 @@ -751,8 +750,7 @@ if (h245_pi != NULL) 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 @@ -780,7 +778,7 @@ if (h245_pi != NULL) value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint8), sizeof(guint8)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %%s", gefx->key);*/ add_new_data_source(%(ACTX)s->pinfo, value_tvb, "booleanArray"); - 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 #.FN_BODY ParameterValue/unsignedMin VAL_PTR = &value @@ -797,7 +795,7 @@ if (h245_pi != NULL) value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint16), sizeof(guint16)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %%s", gefx->key);*/ add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsignedMin"); - 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 #.FN_BODY ParameterValue/unsignedMax VAL_PTR = &value @@ -814,7 +812,7 @@ if (h245_pi != NULL) value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint16), sizeof(guint16)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %%s", gefx->key);*/ add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsignedMax"); - 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 #.FN_BODY ParameterValue/unsigned32Min VAL_PTR = &value @@ -831,7 +829,7 @@ if (h245_pi != NULL) value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint32), sizeof(guint32)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %%s", gefx->key);*/ add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsigned32Min"); - 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 #.FN_BODY ParameterValue/unsigned32Max VAL_PTR = &value @@ -848,7 +846,7 @@ if (h245_pi != NULL) value_tvb = tvb_new_child_real_data(tvb, buf, sizeof(guint32), sizeof(guint32)); /* DEBUG */ /*proto_tree_add_text(tree, tvb, offset>>3, 0, "*** DEBUG dissector_try_string: %%s", gefx->key);*/ add_new_data_source(%(ACTX)s->pinfo, value_tvb, "unsigned32Max"); - 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 #.FN_BODY ParameterValue/octetString VAL_PTR = &value_tvb @@ -859,7 +857,7 @@ if (h245_pi != NULL) 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 |