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-etch.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-etch.c')
| -rw-r--r-- | epan/dissectors/packet-etch.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c index a4a141c665..aa0d6b8b95 100644 --- a/epan/dissectors/packet-etch.c +++ b/epan/dissectors/packet-etch.c @@ -621,7 +621,7 @@ read_struct(unsigned int *offset, tvbuff_t *tvb, proto_tree *etch_tree, int i; ti = proto_tree_add_item(etch_tree, hf_etch_struct, tvb, *offset, - tvb_captured_length(tvb) - *offset, ENC_NA); + tvb_length(tvb) - *offset, ENC_NA); new_tree = proto_item_add_subtree(ti, ett_etch_struct); if (add_type_field) { @@ -758,7 +758,7 @@ dissect_etch_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* read_struct(&offset, tvb, etch_tree, 0); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* @@ -778,7 +778,7 @@ get_etch_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) static int dissect_etch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - if (tvb_captured_length(tvb) < 4) { + if (tvb_length(tvb) < 4) { /* Too small for an etch packet. */ return 0; } |