diff options
author | AndersBroman <anders.broman@ericsson.com> | 2014-11-21 15:54:59 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-11-21 15:05:33 +0000 |
commit | f2fc562edaa71316b0da541a8c95e29953cdd944 (patch) | |
tree | 371fe8ac3eec3cf591682105ac74f54fe5eaac18 /epan/dissectors/packet-m3ua.c | |
parent | 96fb34706b972c55706f0be35172b0a248263e3c (diff) |
Replace tvb_length()
Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
Reviewed-on: https://code.wireshark.org/review/5431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-m3ua.c')
-rw-r--r-- | epan/dissectors/packet-m3ua.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 81b567bcda..b01b3d06d1 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1390,7 +1390,7 @@ dissect_v5_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr /* extract tag and length from the parameter */ tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_reported_length(parameter_tvb) - length; if (!tree && tag != V5_PROTOCOL_DATA_PARAMETER_TAG) return; /* Nothing to do here */ @@ -1517,7 +1517,7 @@ dissect_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr /* extract tag and length from the parameter */ tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_reported_length(parameter_tvb) - length; if (!tree && tag != V6_PROTOCOL_DATA_1_PARAMETER_TAG && tag != V6_PROTOCOL_DATA_2_PARAMETER_TAG) return; /* Nothing to do here */ @@ -1684,7 +1684,7 @@ dissect_v7_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr /* extract tag and length from the parameter */ tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_reported_length(parameter_tvb) - length; if (!tree && tag != V7_PROTOCOL_DATA_1_PARAMETER_TAG && tag != V7_PROTOCOL_DATA_2_PARAMETER_TAG) return; /* Nothing to do here */ @@ -1850,7 +1850,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, /* extract tag and length from the parameter */ tag = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_reported_length(parameter_tvb) - length; if (!tree && tag != PROTOCOL_DATA_PARAMETER_TAG) @@ -1956,7 +1956,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tre tvbuff_t *parameter_tvb; offset = 0; - while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) { + while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset))) { length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); total_length = ADD_PADDING(length); if (remaining_length >= length) |