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 /plugins/wimaxasncp | |
| parent | 9fce4dd4cb47965870d870b77983f8d2c501c810 (diff) | |
| download | wireshark-1d598bbff76f915ec961d301f5eb0eef03d46d0a.tar.gz | |
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 'plugins/wimaxasncp')
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index 377a0d17d9..cd388779b2 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -633,7 +633,7 @@ static void wimaxasncp_proto_tree_add_tlv_ipv6_value( tvb_get_ipv6(tvb, offset, &ip); hostname = get_hostname6(&ip); - ip_str = ip6_to_str(&ip); + ip_str = tvb_ip6_to_str(tvb, offset); proto_tree_add_ipv6_format( tree, hf_value, @@ -1482,8 +1482,6 @@ static void wimaxasncp_dissect_tlv_value( while (offset < tvb_length(tvb)) { proto_tree *ip_address_mask_tree; - struct e_in6_addr ip; - const gchar *s; ip_address_mask_tree = proto_tree_add_subtree( ip_address_mask_list_tree, tvb, offset, 32, @@ -1494,8 +1492,6 @@ static void wimaxasncp_dissect_tlv_value( * -------------------------------------------------------- */ - tvb_get_ipv6(tvb, offset, &ip); - proto_tree_add_item( ip_address_mask_tree, tlv_info->hf_ipv6, @@ -1513,16 +1509,10 @@ static void wimaxasncp_dissect_tlv_value( * mask * -------------------------------------------------------- */ - - tvb_get_ipv6(tvb, offset, &ip); - - s = ip6_to_str(&ip); - - proto_tree_add_ipv6_format_value( + proto_tree_add_item( ip_address_mask_tree, tlv_info->hf_ipv6_mask, - tvb, offset, 16, (const guint8*)&ip, - "%s", s); + tvb, offset, 16, ENC_NA); /* too long to display ? proto_item_append_text( |