diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-22 20:53:46 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-23 03:54:13 +0000 |
| commit | 6fd7e5ba33dd9104803173086c1e79c42c2e3754 (patch) | |
| tree | eb0e9e98d6dda61eeaa83457a606e772543a940d /epan/dissectors/packet-eigrp.c | |
| parent | 46e5fd833eb3e38cab9a10e5d93ce538558196d0 (diff) | |
Remove more deprecated tvb_length calls
Change-Id: I56260a82b19001ab2f87f4be34a9510f127f841f
Reviewed-on: https://code.wireshark.org/review/9050
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-eigrp.c')
| -rw-r--r-- | epan/dissectors/packet-eigrp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index d9a23e2a11..04e841ef7f 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -1103,7 +1103,7 @@ dissect_eigrp_ipv4_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, proto_item *ti_prefixlen, *ti_dst; int first = TRUE; - for (; tvb_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { + for (; tvb_reported_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { length = tvb_get_guint8(tvb, offset); addr_len = ipv4_addr_and_mask(tvb, offset + 1, ip_addr, length); @@ -1160,7 +1160,7 @@ dissect_eigrp_ipv6_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, proto_item *ti_prefixlen, *ti_dst; int first = TRUE; - for (; tvb_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { + for (; tvb_reported_length_remaining(tvb, offset) > 0; offset += (1 + addr_len)) { length = tvb_get_guint8(tvb, offset); addr_len = ipv6_addr_and_mask(tvb, offset + 1, &addr, length); @@ -1286,12 +1286,12 @@ dissect_eigrp_service (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, tvbuff_t *sub_tvb, *reach_tvb; guint16 service, sub_service; - remaining = tvb_length_remaining(tvb, offset); + remaining = tvb_captured_length_remaining(tvb, offset); sub_tree = proto_tree_add_subtree(tree, tvb, offset, remaining, ett_eigrp_tlv_metric, &sub_ti, "SAF Service "); sub_tvb = tvb_new_subset(tvb, offset, remaining, -1); sub_offset = 0; - for (; tvb_length_remaining(sub_tvb, sub_offset) > 0; ) { + for (; tvb_reported_length_remaining(sub_tvb, sub_offset) > 0; ) { service = tvb_get_ntohs(sub_tvb, sub_offset); proto_item_append_text(sub_ti, "%c %s", (sub_offset == 0 ? '=':','), val_to_str_const(service, eigrp_saf_srv2string, "")); @@ -2476,7 +2476,7 @@ dissect_eigrp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ proto_tree_add_item(eigrp_tree, hf_eigrp_opcode, tvb, 1, 1, ENC_BIG_ENDIAN); - size = tvb_length(tvb); + size = tvb_captured_length(tvb); checksum = tvb_get_ntohs(tvb, 2); cacl_checksum = ip_checksum_tvb(tvb, 0, size); @@ -2528,7 +2528,7 @@ dissect_eigrp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ size = tvb_get_ntohs(tvb, offset + 2); if (size == 0) { proto_tree_add_expert(eigrp_tree, pinfo, &ei_eigrp_tlv_len, tvb, offset, -1); - return(tvb_length(tvb)); + return(tvb_captured_length(tvb)); } tlv_tree = proto_tree_add_subtree(eigrp_tree, tvb, offset, size, ett_eigrp_tlv, &ti, @@ -2580,7 +2580,7 @@ dissect_eigrp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ } /* Return the amount of data this dissector was able to dissect */ - return(tvb_length(tvb)); + return(tvb_captured_length(tvb)); } static void |