diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-04-10 14:57:55 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-04-10 13:19:33 +0000 |
| commit | 1785d4206111dcbd0ef7ced3a1aad55da76c7b91 (patch) | |
| tree | b2f250c1f8e3656a304a4907b1a4c1e6acad9f47 /epan/dissectors/packet-v5ua.c | |
| parent | 38d3e063d3fb3d007e61b5e8681372c247171218 (diff) | |
Remove depricated API tvb_length -> tvb_reported_length
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a
Reviewed-on: https://code.wireshark.org/review/8011
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-v5ua.c')
| -rw-r--r-- | epan/dissectors/packet-v5ua.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index 95a9878d89..77bb972456 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -338,7 +338,7 @@ dissect_draft_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete guint16 offset = MGMT_ERROR_MSG_HEADER_LENGTH + tvb_get_ntohs(parameter_tvb, MGMT_ERROR_MSG_LENGTH_OFFSET) + 4; proto_tree_add_item(parameter_tree, hf_draft_error_code, parameter_tvb, offset, MGMT_ERROR_CODE_LENGTH, ENC_BIG_ENDIAN); offset += MGMT_ERROR_CODE_LENGTH ; - if( tvb_length_remaining(parameter_tvb,offset) > 0 ) + if( tvb_reported_length_remaining(parameter_tvb,offset) > 0 ) proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, offset, msg_length - offset,ENC_ASCII|ENC_NA); } /*----------------------Error Indication (Draft)-------------------------------*/ @@ -486,7 +486,7 @@ dissect_draft_tei_status_parameter(tvbuff_t *parameter_tvb, proto_tree *paramete { gint offset; offset = tvb_get_ntohs(parameter_tvb, TEI_STATUS_LENGTH_OFFSET) + 8; - if(tvb_length_remaining(parameter_tvb, offset) > 0 ){ + if(tvb_reported_length_remaining(parameter_tvb, offset) > 0 ){ proto_tree_add_item(parameter_tree, hf_tei_draft_status, parameter_tvb, offset, TEI_STATUS_LENGTH, ENC_BIG_ENDIAN); proto_item_append_text(parameter_item, " (%s)", val_to_str_const(tvb_get_ntohl(parameter_tvb, offset), tei_draft_status_values, "Unknown TEI Status")); @@ -899,7 +899,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_ if((msg_class==0 || msg_class==1 || msg_class==9) && msg_type<=10) length = msg_length; } - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_reported_length(parameter_tvb) - length; paddingl = padding_length; /* create proto_tree stuff */ @@ -1025,7 +1025,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tre offset = 0; - while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) { + while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset))) { tag = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_TAG_OFFSET); length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); if(iua_version==DRAFT){ @@ -1406,7 +1406,7 @@ dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) iua_version = RFC; offset = COMMON_HEADER_LENGTH; - remaining_length = tvb_length_remaining(tvb, offset); + remaining_length = tvb_reported_length_remaining(tvb, offset); while(remaining_length) { tag = tvb_get_ntohs(tvb, offset); @@ -1455,7 +1455,7 @@ dissect_v5ua(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else{ offset+=2; - remaining_length = tvb_length_remaining(tvb, offset); + remaining_length = tvb_reported_length_remaining(tvb, offset); } /* add a notice for the draft version */ if(iua_version == DRAFT){ |