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-lapsat.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-lapsat.c')
| -rw-r--r-- | epan/dissectors/packet-lapsat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 98005bbed1..acf36b5753 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -440,7 +440,7 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) unsigned int hlen, is_response = 0, plen; /* Check that there's enough data */ - if (tvb_captured_length(tvb) < LAPSAT_HEADER_LEN) + if (tvb_length(tvb) < LAPSAT_HEADER_LEN) return; /* Set protocol column */ @@ -496,14 +496,14 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Get the payload */ plen = (addr & LAPSAT_LFI) ? - tvb_get_guint8(tvb, 3) : tvb_captured_length(tvb) - hlen; + tvb_get_guint8(tvb, 3) : tvb_length(tvb) - hlen; if (!plen) return; /* No point in doing more if there is no payload */ - DISSECTOR_ASSERT((plen + hlen) <= tvb_captured_length(tvb)); + DISSECTOR_ASSERT((plen + hlen) <= tvb_length(tvb)); - if ((plen + hlen) == tvb_captured_length(tvb)) { + if ((plen + hlen) == tvb_length(tvb)) { /* Need to integrate the last nibble */ guint8 *data = (guint8 *)tvb_memdup(NULL, tvb, hlen, plen); data[plen-1] |= tvb_get_guint8(tvb, 2) << 4; |