diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2021-02-10 09:01:02 +0100 |
---|---|---|
committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-02-10 12:29:42 +0000 |
commit | 9dd74b2788272a9b650c733cedbb61f7e7ef9f27 (patch) | |
tree | 6bda4f695f3f3af0dd2d7924a92d2e97ec19514f /epan/dissectors/asn1/p1/p1.cnf | |
parent | 52163d05ba9d5f1d1bbbbaf0cc3be232b4c91092 (diff) |
p1: Rewrite do_address for extension attributes
Rewrite do_address handling to use proto_data instead of
pinfo->private_table.
Related to #17156
Diffstat (limited to 'epan/dissectors/asn1/p1/p1.cnf')
-rw-r--r-- | epan/dissectors/asn1/p1/p1.cnf | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/p1/p1.cnf b/epan/dissectors/asn1/p1/p1.cnf index 8317961566..4e830f5436 100644 --- a/epan/dissectors/asn1/p1/p1.cnf +++ b/epan/dissectors/asn1/p1/p1.cnf @@ -599,10 +599,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" #.FN_BODY ExtensionAttribute/extension-attribute-value proto_item_append_text(tree, " (%%s)", val_to_str(actx->external.indirect_reference, p1_ExtensionAttributeType_vals, "extension-attribute-type %%d")); - if (!actx->pinfo->private_table) { - actx->pinfo->private_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); - } - g_hash_table_insert(actx->pinfo->private_table, (gpointer)P1_ADDRESS_CTX, actx->subtree.tree_ctx); + p_add_proto_data(actx->pinfo->pool, actx->pinfo, proto_p1, 0, actx->subtree.tree_ctx); if (dissector_try_uint(p1_extension_attribute_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) { offset =tvb_reported_length(tvb); } else { @@ -614,7 +611,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree); expert_add_info(actx->pinfo, item, &ei_p1_unknown_extension_attribute_type); } - g_hash_table_steal(actx->pinfo->private_table, (gpointer)P1_ADDRESS_CTX); + p_remove_proto_data(actx->pinfo->pool, actx->pinfo, proto_p1, 0); #.FN_BODY RefusedOperation/refused-argument/refused-extension |