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-nb_rtpmux.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-nb_rtpmux.c')
| -rw-r--r-- | epan/dissectors/packet-nb_rtpmux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-nb_rtpmux.c b/epan/dissectors/packet-nb_rtpmux.c index 305408666d..a254be1cea 100644 --- a/epan/dissectors/packet-nb_rtpmux.c +++ b/epan/dissectors/packet-nb_rtpmux.c @@ -79,7 +79,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat */ /* Check that there's enough data */ - if (tvb_captured_length(tvb) < 6) + if (tvb_length(tvb) < 6) return 0; /* Make entries in Protocol column and Info column on summary display */ @@ -141,7 +141,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat /* We have an RTP payload. */ if (rtpdissector) { - captured_length = tvb_captured_length_remaining(tvb, offset + 5); + captured_length = tvb_length_remaining(tvb, offset + 5); if (captured_length > (gint)length) captured_length = length; next_tvb = tvb_new_subset(tvb, offset+5, captured_length, @@ -160,7 +160,7 @@ dissect_nb_rtpmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat } /* Return the amount of data this dissector was able to dissect */ - return tvb_captured_length(tvb); + return tvb_length(tvb); } |