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-sprt.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-sprt.c')
| -rw-r--r-- | epan/dissectors/packet-sprt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index a5cdad1746..6614ac7fb6 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -1014,7 +1014,7 @@ dissect_sprt_data(tvbuff_t *tvb, break; } offset += 2; - } while (tvb_length_remaining(tvb, offset) >= 2); + } while (tvb_captured_length_remaining(tvb, offset) >= 2); break; case SPRT_MODEM_RELAY_MSG_ID_START_JM: /* No additional content */ @@ -1468,13 +1468,13 @@ dissect_sprt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ col_append_fstr(pinfo->cinfo, COL_INFO, ", Seq=%u", seqnum); /* dissect the payload, if any */ - payload_length = tvb_length(tvb) - (6 + noa * 2); /* total sprt length - header stuff */ + payload_length = tvb_captured_length(tvb) - (6 + noa * 2); /* total sprt length - header stuff */ dissect_sprt_data(tvb, pinfo, p_conv_data, sprt_tree, offset, payload_length); if (noa) col_append_str(pinfo->cinfo, COL_INFO, " (ACK fields present)"); - return tvb_length(tvb); + return tvb_captured_length(tvb); } /* heuristic dissector */ @@ -1490,7 +1490,7 @@ dissect_sprt_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat * a heuristic dissector called before us! */ - if (tvb_length(tvb) < 6) + if (tvb_captured_length(tvb) < 6) return FALSE; /* packet is waay to short */ /* Get the fields in the first two octets */ |