diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:17:16 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:23:41 +0000 |
| commit | daa70feddcd3ff35f2771b0b8c4e1be8e5a4e7ea (patch) | |
| tree | cc9a1f72f6c69ebd216dd795733f23a51963bbaa /epan/dissectors/packet-6lowpan.c | |
| parent | 46a808acf4e8c87b61169bfac00799857b38f1f0 (diff) | |
Revert "Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining"
See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 021e7afc9fcba09094d0e2143cc434a34e3b09dc.
Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f
Reviewed-on: https://code.wireshark.org/review/2429
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-6lowpan.c')
| -rw-r--r-- | epan/dissectors/packet-6lowpan.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 3b04e25fd6..faf9f18335 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -1285,7 +1285,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg /* Construct the next header for the UDP datagram. */ offset = BITS_TO_BYTE_LEN(0, bit_offset); - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length); nhdr_list->next = NULL; nhdr_list->proto = IP_PROTO_UDP; @@ -1303,7 +1303,7 @@ dissect_6lowpan_hc1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint dg else { gint length; offset = BITS_TO_BYTE_LEN(0, bit_offset); - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length); nhdr_list->next = NULL; nhdr_list->proto = ipv6.ip6_nxt; @@ -1720,7 +1720,7 @@ dissect_6lowpan_iphc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint d } /* Create an extension header for the remaining payload. */ else { - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr_list = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length); nhdr_list->next = NULL; nhdr_list->proto = ipv6.ip6_nxt; @@ -1910,7 +1910,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi } else { /* Create another next header structure for the remaining payload. */ - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr->next = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length); nhdr->next->next = NULL; nhdr->next->proto = ipv6_ext.ip6e_nxt; @@ -2063,7 +2063,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi #endif /* Create the next header structure for the UDP datagram. */ - length = (gint)tvb_ensure_captured_length_remaining(tvb, offset); + length = (gint)tvb_ensure_length_remaining(tvb, offset); nhdr = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + sizeof(struct udp_hdr) + length); nhdr->next = NULL; nhdr->proto = IP_PROTO_UDP; |