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-sprt.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-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 6614ac7fb6..a5cdad1746 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_captured_length_remaining(tvb, offset) >= 2); + } while (tvb_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_captured_length(tvb) - (6 + noa * 2); /* total sprt length - header stuff */ + payload_length = tvb_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_captured_length(tvb); + return tvb_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_captured_length(tvb) < 6) + if (tvb_length(tvb) < 6) return FALSE; /* packet is waay to short */ /* Get the fields in the first two octets */ |