diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:18:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 18:25:59 +0000 |
| commit | 14824e6adf07a1c3cfb6537ce8723d873ecd0d0f (patch) | |
| tree | bdf1b52ecffe7825d719f34fb4be63c8a60bd1b4 /epan/dissectors/packet-db-lsp.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96.
Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
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 1e0a9fdd24..79b3f339ab 100644 --- a/epan/dissectors/packet-db-lsp.c +++ b/epan/dissectors/packet-db-lsp.c @@ -111,7 +111,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_captured_length_remaining (tvb, offset)) { + if (magic != 0x0301 || length > tvb_length_remaining (tvb, offset)) { /* Probably an unknown packet */ /* expert_add_info_format (pinfo, db_lsp_item, PI_UNDECODED, PI_WARN, "Unknown packet"); */ return 0; @@ -137,7 +137,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_captured_length(tvb); + return tvb_length(tvb); } static guint @@ -145,7 +145,7 @@ get_db_lsp_pdu_len (packet_info *pinfo _U_, tvbuff_t *tvb, int offset) { if (tvb_get_ntohs (tvb, offset + 1) != 0x0301) { /* Unknown data, eat remaining data for this frame */ - return tvb_captured_length_remaining (tvb, offset); + return tvb_length_remaining (tvb, offset); } return tvb_get_ntohs (tvb, offset + 3) + 5; @@ -156,7 +156,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_captured_length(tvb); + return tvb_length(tvb); } static void |