diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:17:16 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:23:41 +0000 |
commit | daa70feddcd3ff35f2771b0b8c4e1be8e5a4e7ea (patch) | |
tree | cc9a1f72f6c69ebd216dd795733f23a51963bbaa /epan | |
parent | 46a808acf4e8c87b61169bfac00799857b38f1f0 (diff) |
Revert "Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining"
See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 021e7afc9fcba09094d0e2143cc434a34e3b09dc.
Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f
Reviewed-on: https://code.wireshark.org/review/2429
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-6lowpan.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-bgp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-btavctp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-btavrcp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_map.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-hci_usb.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-http.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-isup.c | 62 | ||||
-rw-r--r-- | epan/dissectors/packet-l1-events.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ldap.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ldss.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-memcache.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-nbns.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtsp.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-sigcomp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-snmp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ssh.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-syslog.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-tds.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-text-media.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-x11.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-xcsl.c | 2 |
23 files changed, 78 insertions, 78 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 3b04e25fd6..faf9f18335 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1285,7 +1285,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg /* Construct the next header for the UDP datagram. */ offset = BITS_TO_BYTE_LEN(0, bit_offset); - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length); nhdr_list->next = NULL; nhdr_list->proto = IP_PROTO_UDP; @@ -1303,7 +1303,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg else { gint length; offset = BITS_TO_BYTE_LEN(0, bit_offset); - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length); nhdr_list->next = NULL; nhdr_list->proto = ipv6.ip6_nxt; @@ -1720,7 +1720,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d } /* Create an extension header for the remaining payload. */ else { - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length); nhdr_list->next = NULL; nhdr_list->proto = ipv6.ip6_nxt; @@ -1910,7 +1910,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi } else { /* Create another next header structure for the remaining payload. */ - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr->next = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length); nhdr->next->next = NULL; nhdr->next->proto = ipv6_ext.ip6e_nxt; @@ -2063,7 +2063,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi #endif /* Create the next header structure for the UDP datagram. */ - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length); nhdr->next = NULL; nhdr->proto = IP_PROTO_UDP; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index c9e68d5f86..e4bf20cf52 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -6580,7 +6580,7 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * That's what we want. (See "tcp_dissect_pdus()", which is * similar.) */ - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c index 65d87bceb8..50c468673c 100644 --- a/epan/dissectors/packet-btavctp.c +++ b/epan/dissectors/packet-btavctp.c @@ -212,7 +212,7 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) val_to_str_const(cr, cr_vals, "unknown CR"), transaction, val_to_str_const(packet_type, packet_type_vals, "unknown packet type")); - length = tvb_ensure_captured_length_remaining(tvb, offset); + length = tvb_ensure_length_remaining(tvb, offset); /* reassembling */ next_tvb = tvb_new_subset_length(tvb, offset, length); diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c index 155831571c..eac12dca63 100644 --- a/epan/dissectors/packet-btavrcp.c +++ b/epan/dissectors/packet-btavrcp.c @@ -1069,7 +1069,7 @@ dissect_vendor_dependant(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (parameter_length == 0) return offset; - length = tvb_ensure_captured_length_remaining(tvb, offset); + length = tvb_ensure_length_remaining(tvb, offset); if (packet_type == PACKET_TYPE_START) { if (pinfo->fd->flags.visited == 0) { k_interface_id = interface_id; diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 02c0a3ee48..4a9cf93a10 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -4928,7 +4928,7 @@ dissect_gsm_map_ss_USSD_String(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int if (!parameter_tvb) return offset; - length = tvb_ensure_captured_length_remaining(parameter_tvb,0); + length = tvb_ensure_length_remaining(parameter_tvb,0); switch(sms_encoding){ case SMS_ENCODING_7BIT: case SMS_ENCODING_7BIT_LANG: diff --git a/epan/dissectors/packet-hci_usb.c b/epan/dissectors/packet-hci_usb.c index f3f235d6c5..fd94cd9080 100644 --- a/epan/dissectors/packet-hci_usb.c +++ b/epan/dissectors/packet-hci_usb.c @@ -211,7 +211,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } - fragment_info->remaining_length -= tvb_ensure_captured_length_remaining(tvb, offset); + fragment_info->remaining_length -= tvb_ensure_length_remaining(tvb, offset); fragment_add_seq_check(&hci_usb_reassembly_table, tvb, offset, pinfo, session_id, NULL, @@ -232,7 +232,7 @@ dissect_hci_usb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) pitem = proto_tree_add_item(ttree, hf_bthci_usb_packet_complete, tvb, offset, -1, ENC_NA); PROTO_ITEM_SET_GENERATED(pitem); - if (reassembled->len > tvb_ensure_captured_length_remaining(tvb, offset)) { + if (reassembled->len > tvb_ensure_length_remaining(tvb, offset)) { next_tvb = process_reassembled_data(tvb, 0, pinfo, "Reassembled HCI_USB", reassembled, &hci_usb_msg_frag_items, diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 05cbd2f97c..32bf7163aa 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -733,7 +733,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * "tvb_get_ptr()" call won't throw an exception. */ first_linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, TRUE); if (first_linelen == -1) { @@ -817,7 +817,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * we do on it? */ linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (linelen < 0) return -1; @@ -3273,7 +3273,7 @@ dissect_message_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(ti, ett_message_http); while (tvb_reported_length_remaining(tvb, offset) > 0) { len = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (len == -1) break; diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 59b291e4dc..0187764e24 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -8919,7 +8919,7 @@ dissect_ansi_isup_circuit_validation_test_resp_message(tvbuff_t *message_tvb, pr parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "CVR Response Indicator")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CVR_RESP_IND_LENGTH, actual_length), CVR_RESP_IND_LENGTH); dissect_isup_cvr_response_ind_parameter(parameter_tvb, parameter_tree, parameter_item); @@ -8935,7 +8935,7 @@ dissect_ansi_isup_circuit_validation_test_resp_message(tvbuff_t *message_tvb, pr "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "Circuit Group Characters")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CG_CHAR_IND_LENGTH, actual_length), CG_CHAR_IND_LENGTH); dissect_isup_circuit_group_char_ind_parameter(parameter_tvb, parameter_tree, parameter_item); offset += CG_CHAR_IND_LENGTH; @@ -8964,7 +8964,7 @@ dissect_ansi_isup_circuit_reservation_message(tvbuff_t *message_tvb, proto_tree "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(NATURE_OF_CONNECTION_IND_LENGTH, actual_length), NATURE_OF_CONNECTION_IND_LENGTH); dissect_isup_nature_of_connection_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += NATURE_OF_CONNECTION_IND_LENGTH; @@ -8993,7 +8993,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(NATURE_OF_CONNECTION_IND_LENGTH, actual_length), NATURE_OF_CONNECTION_IND_LENGTH); dissect_isup_nature_of_connection_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += NATURE_OF_CONNECTION_IND_LENGTH; @@ -9008,7 +9008,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FORWARD_CALL_IND_LENGTH, actual_length), FORWARD_CALL_IND_LENGTH); dissect_isup_forward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += FORWARD_CALL_IND_LENGTH; @@ -9023,7 +9023,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CALLING_PRTYS_CATEGORY_LENGTH, actual_length), CALLING_PRTYS_CATEGORY_LENGTH); dissect_isup_calling_partys_category_parameter(parameter_tvb, parameter_tree, parameter_item, itu_isup_variant); offset += CALLING_PRTYS_CATEGORY_LENGTH; @@ -9040,7 +9040,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(TRANSMISSION_MEDIUM_REQUIREMENT_LENGTH, actual_length), @@ -9066,7 +9066,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9094,7 +9094,7 @@ dissect_isup_initial_address_message(tvbuff_t *message_tvb, proto_tree *isup_tre PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9134,7 +9134,7 @@ static gint dissect_isup_subsequent_address_message(tvbuff_t *message_tvb, proto PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9166,7 +9166,7 @@ dissect_isup_information_request_message(tvbuff_t *message_tvb, proto_tree *isup "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(INFO_REQUEST_IND_LENGTH, actual_length), INFO_REQUEST_IND_LENGTH); dissect_isup_information_request_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += INFO_REQUEST_IND_LENGTH; @@ -9194,7 +9194,7 @@ dissect_isup_information_message(tvbuff_t *message_tvb, proto_tree *isup_tree) "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(INFO_IND_LENGTH, actual_length), INFO_IND_LENGTH); dissect_isup_information_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += INFO_IND_LENGTH; @@ -9222,7 +9222,7 @@ dissect_isup_continuity_message(tvbuff_t *message_tvb, proto_tree *isup_tree) "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CONTINUITY_IND_LENGTH, actual_length), CONTINUITY_IND_LENGTH); dissect_isup_continuity_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += CONTINUITY_IND_LENGTH; @@ -9250,7 +9250,7 @@ dissect_isup_address_complete_message(tvbuff_t *message_tvb, proto_tree *isup_tr "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(BACKWARD_CALL_IND_LENGTH, actual_length), BACKWARD_CALL_IND_LENGTH); dissect_isup_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += BACKWARD_CALL_IND_LENGTH; @@ -9278,7 +9278,7 @@ dissect_isup_connect_message(tvbuff_t *message_tvb, proto_tree *isup_tree) "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(BACKWARD_CALL_IND_LENGTH, actual_length), BACKWARD_CALL_IND_LENGTH); dissect_isup_backward_call_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += BACKWARD_CALL_IND_LENGTH; @@ -9315,7 +9315,7 @@ dissect_isup_release_message(tvbuff_t *message_tvb, proto_tree *isup_tree) PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9354,7 +9354,7 @@ dissect_isup_suspend_resume_message(tvbuff_t *message_tvb, proto_tree *isup_tree "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(SUSPEND_RESUME_IND_LENGTH, actual_length), SUSPEND_RESUME_IND_LENGTH); dissect_isup_suspend_resume_indicators_parameter(parameter_tvb, parameter_tree, parameter_item); offset += SUSPEND_RESUME_IND_LENGTH; @@ -9391,7 +9391,7 @@ dissect_isup_circuit_group_reset_query_message(tvbuff_t *message_tvb, proto_tree PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9423,7 +9423,7 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree * "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(CIRC_GRP_SV_MSG_TYPE_LENGTH, actual_length), CIRC_GRP_SV_MSG_TYPE_LENGTH); dissect_isup_circuit_group_supervision_message_type_parameter(parameter_tvb, parameter_tree, parameter_item); offset += CIRC_GRP_SV_MSG_TYPE_LENGTH; @@ -9447,7 +9447,7 @@ dissect_isup_circuit_group_blocking_messages(tvbuff_t *message_tvb, proto_tree * PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9479,7 +9479,7 @@ dissect_isup_facility_request_accepted_message(tvbuff_t *message_tvb, proto_tree "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH, actual_length), FACILITY_IND_LENGTH); dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item); offset += FACILITY_IND_LENGTH; @@ -9507,7 +9507,7 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(FACILITY_IND_LENGTH, actual_length), FACILITY_IND_LENGTH); dissect_isup_facility_ind_parameter(parameter_tvb, parameter_item); offset += FACILITY_IND_LENGTH; @@ -9531,7 +9531,7 @@ dissect_isup_facility_reject_message(tvbuff_t *message_tvb, proto_tree *isup_tre offset, PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9579,7 +9579,7 @@ dissect_isup_circuit_group_reset_acknowledgement_message(tvbuff_t *message_tvb, PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9620,7 +9620,7 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9647,7 +9647,7 @@ dissect_isup_circuit_group_query_response_message(tvbuff_t *message_tvb, proto_t PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9679,7 +9679,7 @@ dissect_isup_call_progress_message(tvbuff_t *message_tvb, proto_tree *isup_tree) "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(EVENT_INFO_LENGTH, actual_length), EVENT_INFO_LENGTH); dissect_isup_event_information_parameter(parameter_tvb, parameter_tree, parameter_item); offset += EVENT_INFO_LENGTH; @@ -9716,7 +9716,7 @@ dissect_isup_user_to_user_information_message(tvbuff_t *message_tvb, packet_info PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9758,7 +9758,7 @@ dissect_isup_confusion_message(tvbuff_t *message_tvb, proto_tree *isup_tree) proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), @@ -9911,7 +9911,7 @@ dissect_japan_chg_inf(tvbuff_t *message_tvb, proto_tree *isup_tree) "Mandatory Parameter: %u (%s)", parameter_type, val_to_str_ext_const(parameter_type, &japan_isup_parameter_type_value_ext, "unknown")); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset, MIN(1, actual_length), 1); chg_inf_type = tvb_get_guint8(parameter_tvb, 0); dissect_japan_chg_inf_type(parameter_tvb, parameter_tree, parameter_item); @@ -9935,7 +9935,7 @@ dissect_japan_chg_inf(tvbuff_t *message_tvb, proto_tree *isup_tree) PARAMETER_POINTER_LENGTH, parameter_pointer); proto_tree_add_uint(parameter_tree, hf_isup_parameter_length, message_tvb, offset + parameter_pointer, PARAMETER_LENGTH_IND_LENGTH, parameter_length); - actual_length = tvb_ensure_captured_length_remaining(message_tvb, offset); + actual_length = tvb_ensure_length_remaining(message_tvb, offset); parameter_tvb = tvb_new_subset(message_tvb, offset + parameter_pointer + PARAMETER_LENGTH_IND_LENGTH, MIN(parameter_length, actual_length), diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index 0d84150348..c6e5ccbb48 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -80,7 +80,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat col_set_str(pinfo->cinfo, COL_PROTOCOL, "Layer1"); col_set_str(pinfo->cinfo, COL_DEF_SRC, pinfo->pseudo_header->l1event.uton? "TE" : "NT"); - len = tvb_find_line_end(tvb, 0, tvb_ensure_captured_length_remaining(tvb, 0), + len = tvb_find_line_end(tvb, 0, tvb_ensure_length_remaining(tvb, 0), &next_offset, FALSE); if(len>0) col_add_str(pinfo->cinfo, COL_INFO, tvb_format_text(tvb, 0, len)); @@ -103,7 +103,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat * special processing. */ len = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (len == -1) break; diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index b2c4537333..d1f89ab7f1 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -3838,7 +3838,7 @@ dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo, one_more_pdu: - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); if (length_remaining < 6) return; @@ -3991,7 +3991,7 @@ static void } } - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* It might still be a packet containing a SASL security layer * but it's just that we never saw the BIND packet. diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 7eaa88ed31..779c7efcf9 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -521,7 +521,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void guint digest_type_len; linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); /* Include new-line in line */ diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c index a9c858883b..f4e57e0cf0 100644 --- a/epan/dissectors/packet-memcache.c +++ b/epan/dissectors/packet-memcache.c @@ -624,7 +624,7 @@ get_payload_length (tvbuff_t *tvb, const int token_number, int offset, /* get the header line. */ linelen = tvb_find_line_end (tvb, offset, - tvb_ensure_captured_length_remaining (tvb, offset), &next_offset, + tvb_ensure_length_remaining (tvb, offset), &next_offset, FALSE); if (linelen < 0) { return FALSE; @@ -822,7 +822,7 @@ dissect_memcache_message (tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t * "tvb_get_ptr ()" call won't throw an exception. */ first_linelen = tvb_find_line_end (tvb, offset, - tvb_ensure_captured_length_remaining (tvb, offset), &next_offset, + tvb_ensure_length_remaining (tvb, offset), &next_offset, FALSE); if (first_linelen < 0) { return -1; @@ -1007,7 +1007,7 @@ incr_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) if (tvb_reported_length_remaining (tvb, offset) != 0) { /* Find the end of the line. */ linelen = tvb_find_line_end (tvb, offset, - tvb_ensure_captured_length_remaining (tvb, offset), &next_offset, + tvb_ensure_length_remaining (tvb, offset), &next_offset, FALSE); if (linelen < 0) { /* header is out of the packet limits. */ @@ -1058,7 +1058,7 @@ stat_dissector (tvbuff_t *tvb, proto_tree *tree, int offset) while (tvb_reported_length_remaining (tvb, offset) != 0) { /* Find the end of the line. */ linelen = tvb_find_line_end (tvb, offset, - tvb_ensure_captured_length_remaining (tvb, offset), &next_offset, + tvb_ensure_length_remaining (tvb, offset), &next_offset, FALSE); if (linelen < 0) { return -1; @@ -1171,7 +1171,7 @@ get_response_dissector (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int while (tvb_reported_length_remaining (tvb, offset) != 0) { /* Find the end of the line. */ linelen = tvb_find_line_end (tvb, offset, - tvb_ensure_captured_length_remaining (tvb, offset), &next_offset, + tvb_ensure_length_remaining (tvb, offset), &next_offset, FALSE); if (linelen < 0) { /* header is out of the packet limits. */ diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 4fcd9e2084..4ac278ef88 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1767,7 +1767,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) while (tvb_reported_length_remaining(tvb, offset) > 0) { /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there actually + * We use "tvb_ensure_length_remaining()" to make sure there actually * *is* data remaining. The protocol we're handling could conceivably * consists of a sequence of fixed-length PDUs, and therefore the * "get_pdu_len" routine might not actually fetch anything from @@ -1776,7 +1776,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) * * This means we're guaranteed that "length_remaining" is positive. */ - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 6f04daf235..6fc3d84a98 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1432,7 +1432,7 @@ call_dissect_function(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { const char *saved_proto; - tvb_ensure_captured_length_remaining(tvb, offset); + tvb_ensure_length_remaining(tvb, offset); if (dissect_function != NULL) { /* set the current protocol name */ saved_proto = pinfo->current_proto; diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index 192598c973..415c99b848 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -295,7 +295,7 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo, * That's what we want. (See "tcp_dissect_pdus()", which is * similar.) */ - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? @@ -727,7 +727,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, * "tvb_get_ptr()" call won't throw an exception. */ first_linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); /* @@ -841,7 +841,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, * Find the end of the line. */ linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (linelen < 0) return -1; diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index cb9dff50b1..4c93ed7acd 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -398,7 +398,7 @@ dissect_sigcomp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *_ return offset; /* Search for delimiter 0xffff in the remain tvb buffer */ - length = tvb_ensure_captured_length_remaining(tvb, offset); + length = tvb_ensure_length_remaining(tvb, offset); for(i=0; i<(length-1); ++i){ /* Loop end criteria is (length-1) because we take 2 bytes each loop */ data = tvb_get_ntohs(tvb, offset+i); diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index cded707b8f..8b2d6bc2c1 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -3140,7 +3140,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, * have that routine deal with ASN.1, and just use * "tcp_dissect_pdus()"?) */ - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* NOTE: we have to parse the message piece by piece, since the * capture length may be less than the message length: a 'global' diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 000c0d7fab..6a81252b3b 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -501,12 +501,12 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, } /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_captured_length_remaining(tvb, offset); + remain_length = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? */ @@ -645,12 +645,12 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, struct ssh_peer_data *peer_data = &global_data->peer_data[is_response]; /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_captured_length_remaining(tvb, offset); + remain_length = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? */ @@ -905,12 +905,12 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo, } /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_captured_length_remaining(tvb, offset); + remain_length = tvb_ensure_length_remaining(tvb, offset); /*linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); */ linelen = tvb_find_guint8(tvb, offset, -1, '\n'); diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 2aae317a06..a91dbc212f 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -256,7 +256,7 @@ dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lev = pri & PRIORITY_MASK; } - msg_len = tvb_ensure_captured_length_remaining(tvb, msg_off); + msg_len = tvb_ensure_length_remaining(tvb, msg_off); msg_str = tvb_format_text(tvb, msg_off, msg_len); reported_msg_len = tvb_reported_length_remaining(tvb, msg_off); diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 29cce58bc0..b438b18f7f 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -2216,7 +2216,7 @@ dissect_tds_resp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tds_conv_i token_sz = tds_get_variable_token_size(tvb, pos + 1, token, &token_len_field_size, &token_len_field_val); - length_remaining = tvb_ensure_captured_length_remaining(tvb, pos); + length_remaining = tvb_ensure_length_remaining(tvb, pos); if ((int) token_sz < 0) { token_item = proto_tree_add_text(tree, tvb, pos, 0, "Token"); @@ -2444,7 +2444,7 @@ dissect_tds_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void *pd_save; while (tvb_reported_length_remaining(tvb, offset) != 0) { - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? diff --git a/epan/dissectors/packet-text-media.c b/epan/dissectors/packet-text-media.c index f1955a71b5..a1069c4c65 100644 --- a/epan/dissectors/packet-text-media.c +++ b/epan/dissectors/packet-text-media.c @@ -117,7 +117,7 @@ dissect_text_lines(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da * special processing. */ len = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (len == -1) break; diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index a3e8494cbe..338d61b975 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -4372,13 +4372,13 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo, while (tvb_reported_length_remaining(tvb, offset) != 0) { /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "length_remaining" is * positive. */ - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? @@ -4724,13 +4724,13 @@ dissect_x11_replies(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; while (tvb_reported_length_remaining(tvb, offset) != 0) { /* - * We use "tvb_ensure_captured_length_remaining()" to make sure there + * We use "tvb_ensure_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "length_remaining" is * positive. */ - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); /* * Can we do reassembly? diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index 8bd49b979b..2abc3be958 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -179,7 +179,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree while (tvb_reported_length_remaining(tvb, offset) != 0) { - length_remaining = tvb_ensure_captured_length_remaining(tvb, offset); + length_remaining = tvb_ensure_length_remaining(tvb, offset); if ( length_remaining == -1 ) { return; } |