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-iax2.c | |
| parent | 3557ac4ec688b86ec7819005a3a181600e056251 (diff) | |
| download | wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.gz wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.tar.bz2 wireshark-14824e6adf07a1c3cfb6537ce8723d873ecd0d0f.zip | |
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-iax2.c')
| -rw-r--r-- | epan/dissectors/packet-iax2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 7fd57d4679..75d100b2b9 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1999,7 +1999,7 @@ static guint32 dissect_trunkcall_ts(tvbuff_t *tvb, guint32 offset, proto_tree *i *scallno = tvb_get_ntohs(tvb, offset + 2); ts = tvb_get_ntohs(tvb, offset + 4); - rlen = MIN(tvb_captured_length(tvb) - offset - 6, datalen); + rlen = MIN(tvb_length(tvb) - offset - 6, datalen); if (iax2_tree) { call_item = proto_tree_add_text(iax2_tree, tvb, offset, rlen + 6, "Trunk call from %u, ts: %u", *scallno, ts); @@ -2032,7 +2032,7 @@ static guint32 dissect_trunkcall_nots(tvbuff_t *tvb, guint32 offset, proto_tree *scallno = tvb_get_ntohs(tvb, offset); datalen = tvb_get_ntohs(tvb, offset + 2); - rlen = MIN(tvb_captured_length(tvb) - offset - 4, datalen); + rlen = MIN(tvb_length(tvb) - offset - 4, datalen); if (iax2_tree) { call_item = proto_tree_add_text(iax2_tree, tvb, offset, rlen + 6, "Trunk call from %u", *scallno); @@ -2131,7 +2131,7 @@ static guint32 dissect_trunkpacket(tvbuff_t *tvb, guint32 offset, if (trunkts) { /* Trunk calls with timestamp */ - while(tvb_captured_length_remaining(tvb, offset) >= 6) { + while(tvb_length_remaining(tvb, offset) >= 6) { guint16 scallno; offset = dissect_trunkcall_ts(tvb, offset, iax2_tree, &scallno); if (!call_list_find(calls, scallno)) { @@ -2142,7 +2142,7 @@ static guint32 dissect_trunkpacket(tvbuff_t *tvb, guint32 offset, } else { /* Trunk calls without timestamp */ - while(tvb_captured_length_remaining(tvb, offset) >= 4) { + while(tvb_length_remaining(tvb, offset) >= 4) { guint16 scallno; offset = dissect_trunkcall_nots(tvb, offset, iax2_tree, &scallno); if (!call_list_find(calls, scallno)) { |