diff options
Diffstat (limited to 'epan/dissectors/packet-camel.c')
-rw-r--r-- | epan/dissectors/packet-camel.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 7425f0a472..0bd108faf2 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -1358,7 +1358,7 @@ dissect_camel_AccessPointName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int 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); return offset; } @@ -2009,7 +2009,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); return offset; } @@ -2042,7 +2042,7 @@ dissect_camel_T_bearerCap(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs 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); return offset; } @@ -2096,7 +2096,7 @@ dissect_camel_CalledPartyBCDNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, 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); return offset; @@ -2215,7 +2215,7 @@ dissect_camel_INTEGER_1_864000(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_camel_T_audibleIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - 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 offset = dissect_camel_AudibleIndicator(implicit_tag, tvb, offset, actx, tree, hf_index); @@ -3417,10 +3417,10 @@ dissect_camel_T_pDPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off 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; @@ -4899,7 +4899,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); return offset; } @@ -7981,7 +7981,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 @@ -8019,7 +8019,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 @@ -8056,7 +8056,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 ---------------------------------------*/ |