From e308e7c4de81c2ff7159e444b865ac59de4faa2b Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 18 Jun 2014 18:09:58 +0200 Subject: Update ASN.1 source files with the API changes done in g021e7af Change-Id: I52ecfccbce423206242e3cf99401a8c9e1655d88 Reviewed-on: https://code.wireshark.org/review/2385 Reviewed-by: Pascal Quantin --- asn1/cmip/cmip.cnf | 4 ++-- asn1/cmip/packet-cmip-template.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'asn1/cmip') diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf index 076535e23f..04e5340794 100644 --- a/asn1/cmip/cmip.cnf +++ b/asn1/cmip/cmip.cnf @@ -275,7 +275,7 @@ RejectProblem if(attributeform==ATTRIBUTE_GLOBAL_FORM){ offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree, actx->private_data); } else if (dissector_try_uint(attribute_id_dissector_table, attribute_local_id, tvb, actx->pinfo, tree)) { - offset=tvb_length (tvb); + offset=tvb_captured_length (tvb); } else { offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree); } @@ -454,7 +454,7 @@ RejectProblem if(attributeform==ATTRIBUTE_GLOBAL_FORM){ offset=call_ber_oid_callback(attribute_identifier_id, tvb, offset, actx->pinfo, tree, NULL); } else if (dissector_try_uint(attribute_id_dissector_table, attribute_local_id, tvb, actx->pinfo, tree)) { - offset=tvb_length (tvb); + offset=tvb_captured_length (tvb); } else { offset=dissect_unknown_ber(actx->pinfo, tvb, offset, tree); } diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 205d759c2a..12b2d057e2 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -140,7 +140,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d ; } - return tvb_length(tvb); + return tvb_captured_length(tvb); } /*--- proto_register_cmip ----------------------------------------------*/ -- cgit v1.2.3