diff options
author | Michael Mann <mmann78@netscape.net> | 2013-11-02 15:52:25 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-11-02 15:52:25 +0000 |
commit | 02a83915359f7fadf149df0fe0dea8e971bb32f4 (patch) | |
tree | 33b0da2fee3eed9a07417a0aa7e4c2356638cd33 /asn1/h245 | |
parent | 925cba4e91ea0f44970462d30b62533c8a100e24 (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 'asn1/h245')
-rw-r--r-- | asn1/h245/h245.cnf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 87461f7a11..23d8cf070d 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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } actx->private_data = parent_gefx; #.END @@ -721,7 +721,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_name_dissector_table, gefx->key, tvb_new_subset(tvb, offset>>3, 0, 0), actx->pinfo, tree); + dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset(tvb, offset>>3, 0, 0), actx->pinfo, tree, NULL); } actx->private_data = gefx; /* subdissector could overwrite it */ #.END @@ -752,7 +752,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_name_dissector_table, gefx->key, tvb_new_subset(tvb, offset>>3, 0, 0), actx->pinfo, tree); + dissector_try_string(gef_name_dissector_table, gefx->key, tvb_new_subset(tvb, offset>>3, 0, 0), actx->pinfo, tree, NULL); } actx->private_data = gefx; /* subdissector could overwrite it */ #.END @@ -780,7 +780,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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } #.END #.FN_BODY ParameterValue/unsignedMin VAL_PTR = &value @@ -797,7 +797,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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } #.END #.FN_BODY ParameterValue/unsignedMax VAL_PTR = &value @@ -814,7 +814,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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } #.END #.FN_BODY ParameterValue/unsigned32Min VAL_PTR = &value @@ -831,7 +831,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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } #.END #.FN_BODY ParameterValue/unsigned32Max VAL_PTR = &value @@ -848,7 +848,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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } #.END #.FN_BODY ParameterValue/octetString VAL_PTR = &value_tvb @@ -859,7 +859,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); + dissector_try_string(gef_content_dissector_table, gefx->key, value_tvb, %(ACTX)s->pinfo, %(TREE)s, NULL); } #.END |