diff options
Diffstat (limited to 'epan/dissectors/packet-ucp.c')
| -rw-r--r-- | epan/dissectors/packet-ucp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index 38c8a7401e..0bf3916412 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -808,7 +808,7 @@ ucp_handle_string(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) idx = tvb_find_guint8(tvb, *offset, -1, '/'); if (idx == -1) { /* Force the appropriate exception to be thrown. */ - len = tvb_length_remaining(tvb, *offset); + len = tvb_captured_length_remaining(tvb, *offset); tvb_ensure_bytes_exist(tvb, *offset, len + 1); } else len = idx - *offset; @@ -892,7 +892,7 @@ ucp_handle_int(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) idx = tvb_find_guint8(tvb, *offset, -1, '/'); if (idx == -1) { /* Force the appropriate exception to be thrown. */ - len = tvb_length_remaining(tvb, *offset); + len = tvb_captured_length_remaining(tvb, *offset); tvb_ensure_bytes_exist(tvb, *offset, len + 1); } else len = idx - *offset; @@ -918,7 +918,7 @@ ucp_handle_time(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) idx = tvb_find_guint8(tvb, *offset, -1, '/'); if (idx == -1) { /* Force the appropriate exception to be thrown. */ - len = tvb_length_remaining(tvb, *offset); + len = tvb_captured_length_remaining(tvb, *offset); tvb_ensure_bytes_exist(tvb, *offset, len + 1); } else len = idx - *offset; @@ -1781,7 +1781,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da if (tvb_get_guint8(tvb, 0) != UCP_STX){ proto_tree_add_text(tree, tvb, 0, -1,"UCP_STX missing, this is not a new packet"); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* Get data needed for dissect_ucp_common */ @@ -1949,7 +1949,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da /* Queue packet for Tap */ tap_queue_packet(ucp_tap, pinfo, tap_rec); - return tvb_length(tvb); + return tvb_captured_length(tvb); } static int @@ -1957,7 +1957,7 @@ dissect_ucp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { tcp_dissect_pdus(tvb, pinfo, tree, ucp_desegment, UCP_HEADER_SIZE, get_ucp_pdu_len, dissect_ucp_common, data); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* @@ -1971,7 +1971,7 @@ dissect_ucp_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Heuristic */ - if (tvb_length(tvb) < UCP_HEADER_SIZE) + if (tvb_captured_length(tvb) < UCP_HEADER_SIZE) return FALSE; if ((tvb_get_guint8(tvb, 0) != UCP_STX) || |