diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-22 17:05:37 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 00:06:19 +0000 |
| commit | 67ab8a059c489022aebe0e27d1f937c7b6abad06 (patch) | |
| tree | 6b6cb9e97c0b56ac14ea8224760356e1c5965748 /epan/dissectors/packet-rtcdc.c | |
| parent | a43682d4fd9075f07f8dce1ddc5bda3e07296c27 (diff) | |
Remove more deprecated tvb_length
Change-Id: I36603453c2563406f82663683930088dedd5f39c
Reviewed-on: https://code.wireshark.org/review/9041
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-rtcdc.c')
| -rw-r--r-- | epan/dissectors/packet-rtcdc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-rtcdc.c b/epan/dissectors/packet-rtcdc.c index faeca65080..cbee3e9f3b 100644 --- a/epan/dissectors/packet-rtcdc.c +++ b/epan/dissectors/packet-rtcdc.c @@ -141,7 +141,7 @@ dissect_open_request_message(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree * static void dissect_open_response_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtcdc_tree, proto_item *rtcdc_item) { - if (tvb_length(tvb) > DATA_CHANNEL_RESPONSE_LENGTH) { + if (tvb_reported_length(tvb) > DATA_CHANNEL_RESPONSE_LENGTH) { expert_add_info(pinfo, rtcdc_item, &ei_rtcdc_message_too_long); } if (rtcdc_tree) { @@ -157,7 +157,7 @@ dissect_open_response_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtc static void dissect_open_ack_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rtcdc_tree _U_, proto_item *rtcdc_item) { - if (tvb_length(tvb) > DATA_CHANNEL_ACK_LENGTH) { + if (tvb_reported_length(tvb) > DATA_CHANNEL_ACK_LENGTH) { expert_add_info(pinfo, rtcdc_item, &ei_rtcdc_message_too_long); } return; @@ -219,7 +219,7 @@ dissect_new_open_request_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree * } label_length = tvb_get_ntohs(tvb, NEW_LABEL_LENGTH_OFFSET); protocol_length = tvb_get_ntohs(tvb, NEW_PROTOCOL_LENGTH_OFFSET); - if (NEW_OPEN_REQUEST_HEADER_LENGTH + (guint)label_length + (guint)protocol_length != tvb_length(tvb)) { + if (NEW_OPEN_REQUEST_HEADER_LENGTH + (guint)label_length + (guint)protocol_length != tvb_reported_length(tvb)) { expert_add_info(pinfo, rtcdc_item, &ei_rtcdc_inconsistent_label_and_parameter_length); } if (rtcdc_tree) { @@ -266,7 +266,7 @@ dissect_rtcdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U expert_add_info(pinfo, msg_item, &ei_rtcdc_message_type_unknown); break; } - return tvb_length(tvb); + return tvb_captured_length(tvb); } void |