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-reload-framing.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
| download | wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.gz | |
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-reload-framing.c')
| -rw-r--r-- | epan/dissectors/packet-reload-framing.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-reload-framing.c b/epan/dissectors/packet-reload-framing.c index 7c7a4ef274..c1cf0d9341 100644 --- a/epan/dissectors/packet-reload-framing.c +++ b/epan/dissectors/packet-reload-framing.c @@ -350,7 +350,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr next_tvb = tvb_new_subset(tvb, offset, effective_length - offset, message_length); if (reload_handle == NULL) { expert_add_info(pinfo, ti, &ei_reload_no_dissector); - return tvb_captured_length(tvb); + return tvb_length(tvb); } call_dissector_only(reload_handle, next_tvb, pinfo, tree, NULL); } @@ -443,7 +443,7 @@ dissect_reload_framing_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr DISSECTOR_ASSERT_NOT_REACHED(); } - return tvb_captured_length(tvb); + return tvb_length(tvb); } static int @@ -458,7 +458,7 @@ dissect_reload_framing_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* XXX: Check if we have a valid RELOAD Frame Type ? */ tcp_dissect_pdus(tvb, pinfo, tree, TRUE, MIN_HDR_LENGTH, get_reload_framing_message_length, dissect_reload_framing, data); - return tvb_captured_length(tvb); + return tvb_length(tvb); } /* ToDo: If a TCP connection is identified heuristically as reload-framing, then |