diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-22 20:53:46 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 03:54:13 +0000 |
| commit | 6fd7e5ba33dd9104803173086c1e79c42c2e3754 (patch) | |
| tree | eb0e9e98d6dda61eeaa83457a606e772543a940d /epan/dissectors/packet-enrp.c | |
| parent | 46e5fd833eb3e38cab9a10e5d93ce538558196d0 (diff) | |
Remove more deprecated tvb_length calls
Change-Id: I56260a82b19001ab2f87f4be34a9510f127f841f
Reviewed-on: https://code.wireshark.org/review/9050
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-enrp.c')
| -rw-r--r-- | epan/dissectors/packet-enrp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index fe318406c3..4e66ebb6df 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -176,7 +176,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) code = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET); length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); - padding_length = tvb_length(cause_tvb) - length; + padding_length = tvb_captured_length(cause_tvb) - length; cause_tree = proto_tree_add_subtree(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, -1, ett_enrp_cause, &cause_item, val_to_str_const(code, cause_code_values, "Unknown error cause")); @@ -475,7 +475,7 @@ dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tr proto_tree_add_item(parameter_tree, hf_policy_distance, parameter_tvb, POLICY_WRANDDPF_DISTANCE_OFFSET, POLICY_WRANDDPF_DISTANCE_LENGTH, ENC_BIG_ENDIAN); break; default: - length = tvb_length(parameter_tvb) - POLICY_VALUE_OFFSET; + length = tvb_reported_length(parameter_tvb) - POLICY_VALUE_OFFSET; if (length > 0) { proto_tree_add_item(parameter_tree, hf_policy_value, parameter_tvb, POLICY_VALUE_OFFSET, length, ENC_NA); } @@ -641,7 +641,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *enrp_tree) /* extract tag and length from the parameter */ type = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET); length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET); - padding_length = tvb_length(parameter_tvb) - length; + padding_length = tvb_captured_length(parameter_tvb) - length; /* create proto_tree stuff */ parameter_tree = proto_tree_add_subtree(enrp_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, -1, @@ -713,7 +713,7 @@ dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree) tvbuff_t *parameter_tvb; offset = 0; - while((remaining_length = tvb_length_remaining(parameters_tvb, offset)) > 0) { + while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset)) > 0) { length = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET); total_length = ADD_PADDING(length); if (remaining_length >= length) @@ -904,7 +904,7 @@ dissect_enrp_error_message(tvbuff_t *message_tvb, proto_tree *message_tree, prot static void dissect_unknown_message(tvbuff_t *message_tvb, proto_tree *message_tree, proto_tree *flags_tree _U_) { - proto_tree_add_item(message_tree, hf_message_value, message_tvb, MESSAGE_VALUE_OFFSET, tvb_length(message_tvb) - MESSAGE_HEADER_LENGTH, ENC_NA); + proto_tree_add_item(message_tree, hf_message_value, message_tvb, MESSAGE_VALUE_OFFSET, tvb_captured_length(message_tvb) - MESSAGE_HEADER_LENGTH, ENC_NA); } #define ENRP_PRESENCE_MESSAGE_TYPE 0x01 |