diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-23 17:22:18 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-24 00:22:50 +0000 |
| commit | f92fab41a5266cb380c443882ce5efd5a7ee3318 (patch) | |
| tree | 13e190875507342a2c5847b2629a6dab44d2d61d /epan/dissectors/packet-lapsat.c | |
| parent | ad784bc7ce29c2d8ad64bca73e4863a6353c578f (diff) | |
Remove a bunch more deprecated tvb_length calls
(getting really close!)
Change-Id: Ibf22a5f727c4dc0070b78144a4b0ab8e0c5e1bce
Reviewed-on: https://code.wireshark.org/review/9081
Reviewed-by: Evan Huus <eapache@gmail.com>
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 3b0f16b046..5939a0f1fa 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -438,7 +438,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_length(tvb) < LAPSAT_HEADER_LEN) + if (tvb_captured_length(tvb) < LAPSAT_HEADER_LEN) return; /* Set protocol column */ @@ -494,14 +494,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_length(tvb) - hlen; + tvb_get_guint8(tvb, 3) : tvb_captured_length(tvb) - hlen; if (!plen) return; /* No point in doing more if there is no payload */ - DISSECTOR_ASSERT((plen + hlen) <= tvb_length(tvb)); + DISSECTOR_ASSERT((plen + hlen) <= tvb_captured_length(tvb)); - if ((plen + hlen) == tvb_length(tvb)) { + if ((plen + hlen) == tvb_captured_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; |