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-rtcp.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-rtcp.c')
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 7a2b42c13e..ab62369284 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -1637,7 +1637,7 @@ dissect_rtcp_app( tvbuff_t *tvb,packet_info *pinfo, int offset, proto_tree *tree next_tvb = tvb_new_subset_length(tvb, offset-8, app_length+4); /* look for registered sub-dissectors */ if (dissector_try_string(rtcp_dissector_table, ascii_name, next_tvb, pinfo, tree, NULL)) { - /* found subdissector - return tvb_captured_length */ + /* found subdissector - return tvb_length */ offset += 4; packet_len -= 4; if ( padding ) { @@ -2903,7 +2903,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) gboolean e_bit; srtcp_info = p_conv_data->srtcp_info; /* get the offset to the start of the SRTCP fields at the end of the packet */ - srtcp_offset = tvb_captured_length_remaining(tvb, offset) - srtcp_info->auth_tag_len - srtcp_info->mki_len - 4; + srtcp_offset = tvb_length_remaining(tvb, offset) - srtcp_info->auth_tag_len - srtcp_info->mki_len - 4; /* It has been setup as SRTCP, but skip to the SRTCP E field at the end to see if this particular packet is encrypted or not. The E bit is the MSB. */ srtcp_index = tvb_get_ntohl(tvb,srtcp_offset); |