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-macsec.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-macsec.c')
-rw-r--r-- | epan/dissectors/packet-macsec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-macsec.c b/epan/dissectors/packet-macsec.c index 3770b99a39..b759cd8d4a 100644 --- a/epan/dissectors/packet-macsec.c +++ b/epan/dissectors/packet-macsec.c @@ -85,12 +85,12 @@ static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } /* Check for short length */ - if (tvb_captured_length(tvb) <= (sectag_length + icv_length)) { + if (tvb_length(tvb) <= (sectag_length + icv_length)) { return 0; } data_offset = sectag_length; - data_length = tvb_captured_length(tvb) - sectag_length - icv_length; + data_length = tvb_length(tvb) - sectag_length - icv_length; icv_offset = data_length + data_offset; next_tvb = tvb_new_subset_length(tvb, data_offset, data_length); @@ -139,7 +139,7 @@ static int dissect_macsec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v icv_length, ENC_NA); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } void |