diff options
Diffstat (limited to 'asn1/p1/p1.cnf')
-rw-r--r-- | asn1/p1/p1.cnf | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf index 26e7a2c979..b08f2b6c59 100644 --- a/asn1/p1/p1.cnf +++ b/asn1/p1/p1.cnf @@ -537,12 +537,12 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" if(actx->external.indirect_ref_present) { proto_item_append_text(tree, " (%%s)", val_to_str(actx->external.indirect_reference, p1_StandardExtension_vals, "standard-extension %%d")); if (dissector_try_uint(p1_extension_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) { - offset = tvb_captured_length(tvb); + offset = tvb_length(tvb); } else { proto_item *item = NULL; proto_tree *next_tree = NULL; - item = proto_tree_add_text(tree, tvb, 0, tvb_captured_length_remaining(tvb, offset), + item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "Dissector for standard-extension %%d not implemented. Contact Wireshark developers if you want this supported", actx->external.indirect_reference); next_tree = proto_item_add_subtree(item, ett_p1_unknown_standard_extension); offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree); @@ -576,12 +576,12 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" proto_item_append_text(tree, " (%%s)", val_to_str(actx->external.indirect_reference, p1_ExtensionAttributeType_vals, "extension-attribute-type %%d")); if (dissector_try_uint(p1_extension_attribute_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) { - offset =tvb_captured_length(tvb); + offset =tvb_length(tvb); } else { proto_item *item = NULL; proto_tree *next_tree = NULL; - item = proto_tree_add_text(tree, tvb, 0, tvb_captured_length_remaining(tvb, offset), + item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "Dissector for extension-attribute-type %%d not implemented. Contact Wireshark developers if you want this supported", actx->external.indirect_reference); next_tree = proto_item_add_subtree(item, ett_p1_unknown_extension_attribute_type); offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree); @@ -669,7 +669,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" /* we can do this now constructed octet strings are supported */ offset = dissect_ber_octet_string(FALSE, actx, tree, tvb, offset, hf_index, &next_tvb); - proto_item_set_text(actx->created_item, "content (%%u bytes)", tvb_captured_length (next_tvb)); + proto_item_set_text(actx->created_item, "content (%%u bytes)", tvb_length (next_tvb)); if (next_tvb) { if (ctx && ctx->content_type_id) { @@ -679,7 +679,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" proto_tree *next_tree = NULL; proto_tree_add_expert(actx->subtree.top_tree ? actx->subtree.top_tree : tree, actx->pinfo, &ei_p1_unknown_built_in_content_type, - next_tvb, 0, tvb_captured_length_remaining(tvb, offset)); + next_tvb, 0, tvb_length_remaining(tvb, offset)); if (item) { next_tree=proto_item_add_subtree(item, ett_p1_content_unknown); } @@ -699,10 +699,10 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" %(DEFAULT_BODY)s if (ctx && ctx->do_address) { - proto_item_append_text(actx->subtree.tree, " %%s", tvb_format_text(mtaname, 0, tvb_captured_length(mtaname))); + proto_item_append_text(actx->subtree.tree, " %%s", tvb_format_text(mtaname, 0, tvb_length(mtaname))); } else { if (mtaname) { - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(mtaname, 0, tvb_captured_length(mtaname))); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(mtaname, 0, tvb_length(mtaname))); } } @@ -1054,10 +1054,10 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" if(id) { if (ctx && ctx->do_address) - proto_item_append_text(actx->subtree.tree, " $ %%s)", tvb_format_text(id, 0, tvb_captured_length(id))); + proto_item_append_text(actx->subtree.tree, " $ %%s)", tvb_format_text(id, 0, tvb_length(id))); if (hf_index == hf_p1_subject_identifier) - col_append_fstr(actx->pinfo->cinfo, COL_INFO, " $ %%s)", tvb_format_text(id, 0, tvb_captured_length(id))); + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " $ %%s)", tvb_format_text(id, 0, tvb_length(id))); } #.FN_BODY MTSIdentifier @@ -1126,7 +1126,7 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" %(DEFAULT_BODY)s if(arrival && ctx && ctx->do_address) - proto_item_append_text(actx->subtree.tree, " %%s", tvb_format_text(arrival, 0, tvb_captured_length(arrival))); + proto_item_append_text(actx->subtree.tree, " %%s", tvb_format_text(arrival, 0, tvb_length(arrival))); #.FN_PARS RoutingAction VAL_PTR = &action @@ -1174,12 +1174,12 @@ MessageToken B "2.6.1.7.36" "id-hat-forwarded-token" proto_item_append_text(tree, " (%%s)", val_to_str(actx->external.indirect_reference, p1_TokenDataType_vals, "tokendata-type %%d")); if (dissector_try_uint(p1_tokendata_dissector_table, actx->external.indirect_reference, tvb, actx->pinfo, tree)) { - offset = tvb_captured_length(tvb); + offset = tvb_length(tvb); } else { proto_item *item = NULL; proto_tree *next_tree = NULL; - item = proto_tree_add_text(tree, tvb, 0, tvb_captured_length_remaining(tvb, offset), + item = proto_tree_add_text(tree, tvb, 0, tvb_length_remaining(tvb, offset), "Dissector for tokendata-type %%d not implemented. Contact Wireshark developers if you want this supported", actx->external.indirect_reference); next_tree = proto_item_add_subtree(item, ett_p1_unknown_tokendata_type); offset = dissect_unknown_ber(actx->pinfo, tvb, offset, next_tree); |