diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-21 08:02:26 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-26 21:17:10 +0000 |
| commit | 3d3f97320b90296bdb3649929bcc73a55823dee9 (patch) | |
| tree | 4b906cf0a1e6e25371fc6eecbef89461d90c0cff /plugins/wimaxasncp | |
| parent | b68fb9b659b0debd7286195f9ad194be998cc3ff (diff) | |
Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71
Reviewed-on: https://code.wireshark.org/review/5934
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/wimaxasncp')
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index e4570113d1..377a0d17d9 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -596,7 +596,7 @@ static void wimaxasncp_proto_tree_add_tlv_ipv4_value( ip = tvb_get_ipv4(tvb, offset); hostname = get_hostname(ip); - ip_str = ip_to_str((guint8 *)&ip); + ip_str = tvb_ip_to_str(tvb, offset); proto_tree_add_ipv4_format( tree, hf_value, @@ -1563,7 +1563,7 @@ static void wimaxasncp_dissect_tlv_value( proto_item_append_text( item, " - %s (%s)", - get_hostname(ip), ip_to_str((guint8 *)&ip)); + get_hostname(ip), tvb_ip_to_str(tvb, offset)); offset += 4; @@ -1574,13 +1574,12 @@ static void wimaxasncp_dissect_tlv_value( ip = tvb_get_ipv4(tvb, offset); - s = ip_to_str((guint8 *)&ip); + s = tvb_ip_to_str(tvb, offset); - proto_tree_add_ipv4_format_value( + proto_tree_add_item( ip_address_mask_tree, tlv_info->hf_ipv4_mask, - tvb, offset, 4, ip, - "%s", s); + tvb, offset, 4, ENC_BIG_ENDIAN); proto_item_append_text( item, " / %s", s); |