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-afs.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-afs.c')
| -rw-r--r-- | epan/dissectors/packet-afs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index b9aba67e96..0d332db4d7 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -916,7 +916,7 @@ static const fragment_items afs_frag_items = { } else { \ if ( ! seen_null ) { \ proto_tree_add_text(tree, tvb, offset, \ - tvb_captured_length_remaining(tvb, offset), \ + tvb_length_remaining(tvb, offset), \ "Null Interface Addresses"); \ seen_null = 1; \ } \ @@ -971,7 +971,7 @@ static const fragment_items afs_frag_items = { offset += bytes; /* Raw data - to end of frame */ -#define OUT_BYTES_ALL(field) OUT_BYTES(field, tvb_captured_length_remaining(tvb,offset)) +#define OUT_BYTES_ALL(field) OUT_BYTES(field, tvb_length_remaining(tvb,offset)) /* Raw data */ #define OUT_BYTES(field, bytes) \ @@ -1025,7 +1025,7 @@ static const fragment_items afs_frag_items = { OUT_RXString(hf_afs_kauth_realm); \ } -#define GETSTR (tvb_format_text(tvb,offset,tvb_captured_length_remaining(tvb,offset))) +#define GETSTR (tvb_format_text(tvb,offset,tvb_length_remaining(tvb,offset))) #define VALID_OPCODE(opcode) ((opcode >= OPCODE_LOW && opcode <= OPCODE_HIGH) || \ (opcode >= VOTE_LOW && opcode <= VOTE_HIGH) || \ @@ -1828,7 +1828,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) frag_msg = fragment_add_seq_check(&afs_reassembly_table, tvb, offset, pinfo, afs_seqid, NULL, - rxinfo->seq-1, tvb_captured_length_remaining(tvb, offset), + rxinfo->seq-1, tvb_length_remaining(tvb, offset), ! ( rxinfo->flags & RX_LAST_PACKET ) ); new_tvb = process_reassembled_data( tvb, offset, pinfo, "Reassembled RX", frag_msg, @@ -1840,7 +1840,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) col_append_str(pinfo->cinfo, COL_INFO, " [AFS reassembled]"); } else { col_set_str(pinfo->cinfo, COL_INFO, "[AFS segment of a reassembled PDU]"); - return tvb_captured_length(tvb); + return tvb_length(tvb); } } @@ -1917,7 +1917,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } - return tvb_captured_length(tvb); + return tvb_length(tvb); } |