From d0ac93756794ed29650dc91f7f8304b11504c61b Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Thu, 19 Jun 2014 20:31:08 +0200 Subject: Revert "Update ASN.1 source files with the API changes done in g021e7af" This reverts commit e308e7c4de81c2ff7159e444b865ac59de4faa2b. Change-Id: I079616d63f643f79f1bc03ef5fdf724f36df4071 Reviewed-on: https://code.wireshark.org/review/2435 Reviewed-by: Pascal Quantin --- asn1/camel/camel.cnf | 16 ++++++++-------- asn1/camel/packet-camel-template.c | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'asn1/camel') diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf index 9ffa762688..6e078cc0f9 100644 --- a/asn1/camel/camel.cnf +++ b/asn1/camel/camel.cnf @@ -296,7 +296,7 @@ proto_tree *subtree; return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_cause); - dissect_q931_cause_ie(parameter_tvb, 0, tvb_captured_length_remaining(parameter_tvb,0), subtree, hf_camel_cause_indicator, &Cause_value, isup_parameter_type_value); + dissect_q931_cause_ie(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0), subtree, hf_camel_cause_indicator, &Cause_value, isup_parameter_type_value); #.END #---------------------------------------------------------------------------------------- @@ -312,7 +312,7 @@ proto_tree *subtree; return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_RPcause); - dissect_RP_cause_ie(parameter_tvb, 0, tvb_captured_length_remaining(parameter_tvb,0), subtree, hf_camel_RP_Cause, &Cause_value); + dissect_RP_cause_ie(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0), subtree, hf_camel_RP_Cause, &Cause_value); #.END #---------------------------------------------------------------------------------------- @@ -421,7 +421,7 @@ proto_tree *subtree; if (!parameter_tvb) return offset; - dissect_q931_bearer_capability_ie(parameter_tvb, 0, tvb_captured_length_remaining(parameter_tvb,0), tree); + dissect_q931_bearer_capability_ie(parameter_tvb, 0, tvb_length_remaining(parameter_tvb,0), tree); #.END #---------------------------------------------------------------------------------------- @@ -466,7 +466,7 @@ proto_tree *subtree; if (!parameter_tvb) return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_AccessPointName); - de_sm_apn(parameter_tvb, subtree, actx->pinfo, 0, tvb_captured_length(parameter_tvb), NULL, 0); + de_sm_apn(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0); #.END #---------------------------------------------------------------------------------------- @@ -522,10 +522,10 @@ proto_tree *subtree; case 1: /* IETF */ switch(PDPTypeNumber){ case 0x21: /* IPv4 */ - proto_tree_add_item(subtree, hf_camel_PDPAddress_IPv4, parameter_tvb, 0, tvb_captured_length(parameter_tvb), ENC_BIG_ENDIAN); + proto_tree_add_item(subtree, hf_camel_PDPAddress_IPv4, parameter_tvb, 0, tvb_length(parameter_tvb), ENC_BIG_ENDIAN); break; case 0x57: /* IPv6 */ - proto_tree_add_item(subtree, hf_camel_PDPAddress_IPv6, parameter_tvb, 0, tvb_captured_length(parameter_tvb), ENC_NA); + proto_tree_add_item(subtree, hf_camel_PDPAddress_IPv6, parameter_tvb, 0, tvb_length(parameter_tvb), ENC_NA); break; default: break; @@ -629,7 +629,7 @@ proto_tree *subtree; # V3 and V4 incompatibillity bug #1719 #.FN_BODY CAMEL-AChBillingChargingCharacteristics/timeDurationCharging/audibleIndicator - if (tvb_captured_length_remaining(tvb,offset) < 2) + if (tvb_length_remaining(tvb,offset) < 2) offset = dissect_camel_BOOLEAN(TRUE, tvb, offset, actx , tree, hf_camel_audibleIndicatorTone); else %(DEFAULT_BODY)s @@ -658,7 +658,7 @@ proto_tree *subtree; if (!parameter_tvb) return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_calledpartybcdnumber); - de_cld_party_bcd_num(parameter_tvb, subtree, actx->pinfo, 0, tvb_captured_length(parameter_tvb), NULL, 0); + de_cld_party_bcd_num(parameter_tvb, subtree, actx->pinfo, 0, tvb_length(parameter_tvb), NULL, 0); #.END diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c index 0a64de3386..bdda6fe680 100644 --- a/asn1/camel/packet-camel-template.c +++ b/asn1/camel/packet-camel-template.c @@ -1104,7 +1104,7 @@ dissect_camel_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -1142,7 +1142,7 @@ dissect_camel_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -1179,7 +1179,7 @@ dissect_camel(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* tap_queue_packet(camel_tap, pinfo, gp_camelsrt_info); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } /*--- proto_reg_handoff_camel ---------------------------------------*/ -- cgit v1.2.3