diff options
author | AndersBroman <a.broman@bredband.net> | 2015-04-16 15:58:53 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-04-16 14:01:45 +0000 |
commit | 338f3a5eb1618507035fdabaece8f54d6be54379 (patch) | |
tree | b7c57c1ac38f85e912567b5b0a6a8623e441300f /epan/dissectors/packet-db-lsp.c | |
parent | 4171f5590b0df5506c98e559100e21300edb33d0 (diff) |
Remove deprecated tvb_lengt APIs
Change-Id: Ic3c364384dcc1d87089d646665f5900081de13df
Reviewed-on: https://code.wireshark.org/review/8089
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-db-lsp.c')
-rw-r--r-- | epan/dissectors/packet-db-lsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-db-lsp.c b/epan/dissectors/packet-db-lsp.c index 4bac25b5a3..a9168a2a8d 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -112,7 +112,7 @@ dissect_db_lsp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d proto_tree_add_item (db_lsp_tree, hf_length, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - if (magic != 0x0301 || length > tvb_length_remaining (tvb, offset)) { + if (magic != 0x0301 || length > tvb_reported_length_remaining (tvb, offset)) { /* Probably an unknown packet */ /* expert_add_info_format (pinfo, db_lsp_item, PI_UNDECODED, PI_WARN, "Unknown packet"); */ return 0; @@ -138,7 +138,7 @@ dissect_db_lsp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d proto_item_append_text (db_lsp_item, ", Type: %d, Length: %d", type, length); proto_item_set_len (db_lsp_item, length + 5); - return tvb_length(tvb); + return tvb_reported_length(tvb); } static guint @@ -147,7 +147,7 @@ get_db_lsp_pdu_len (packet_info *pinfo _U_, tvbuff_t *tvb, { if (tvb_get_ntohs (tvb, offset + 1) != 0x0301) { /* Unknown data, eat remaining data for this frame */ - return tvb_length_remaining (tvb, offset); + return tvb_reported_length_remaining (tvb, offset); } return tvb_get_ntohs (tvb, offset + 3) + 5; @@ -158,7 +158,7 @@ dissect_db_lsp_tcp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d { tcp_dissect_pdus (tvb, pinfo, tree, db_lsp_desegment, 5, get_db_lsp_pdu_len, dissect_db_lsp_pdu, data); - return tvb_length(tvb); + return tvb_reported_length(tvb); } static void |