diff options
author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:45:00 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:14:58 +0000 |
commit | 246fe2ca4c67d8c98caa84e2f57694f6322e2f96 (patch) | |
tree | 5f8651517a3423cce11c50e18371d8a73c3c7665 /epan/dissectors/packet-iax2.c | |
parent | 971ffd683ea23362bd8009567ff7860371e6e2cc (diff) |
Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
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 dd60ab58b3..7ab22eeb08 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_length(tvb) - offset - 6, datalen); + rlen = MIN(tvb_captured_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_length(tvb) - offset - 4, datalen); + rlen = MIN(tvb_captured_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_length_remaining(tvb, offset) >= 6) { + while(tvb_captured_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_length_remaining(tvb, offset) >= 4) { + while(tvb_captured_length_remaining(tvb, offset) >= 4) { guint16 scallno; offset = dissect_trunkcall_nots(tvb, offset, iax2_tree, &scallno); if (!call_list_find(calls, scallno)) { |