diff options
author | Michael Mann <mmann78@netscape.net> | 2014-12-21 12:38:13 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-12-28 14:09:27 +0000 |
commit | 1d598bbff76f915ec961d301f5eb0eef03d46d0a (patch) | |
tree | 2908958a3f78d53a8f10036e7f8ac01ed1b390d1 /epan/dissectors/packet-eigrp.c | |
parent | 9fce4dd4cb47965870d870b77983f8d2c501c810 (diff) |
Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b
Reviewed-on: https://code.wireshark.org/review/6060
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-eigrp.c')
-rw-r--r-- | epan/dissectors/packet-eigrp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 282a1948a8..f9d7044567 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -1115,6 +1115,7 @@ dissect_eigrp_ipv6_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, guint8 length; int addr_len; struct e_in6_addr addr; + address addr_str; proto_item *ti_prefixlen, *ti_dst; int first = TRUE; @@ -1136,12 +1137,13 @@ dissect_eigrp_ipv6_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, addr_len++; } + SET_ADDRESS(&addr_str, AT_IPv6, 16, addr.bytes); ti_dst = proto_tree_add_text(tree, tvb, offset, addr_len, - "Destination: %s", ip6_to_str(&addr)); + "Destination: %s", address_to_str(wmem_packet_scope(), &addr_str)); /* add it to the top level line */ proto_item_append_text(ti," %c %s/%u", first ? '=':',', - ip6_to_str(&addr), length); + address_to_str(wmem_packet_scope(), &addr_str), length); if (unreachable) { expert_add_info(pinfo, ti_dst, &ei_eigrp_unreachable); |