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/profinet/packet-pn-dcp.c | |
parent | b68fb9b659b0debd7286195f9ad194be998cc3ff (diff) | |
download | wireshark-3d3f97320b90296bdb3649929bcc73a55823dee9.tar.gz |
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/profinet/packet-pn-dcp.c')
-rw-r--r-- | plugins/profinet/packet-pn-dcp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c index b17c12f415..e96c77d547 100644 --- a/plugins/profinet/packet-pn-dcp.c +++ b/plugins/profinet/packet-pn-dcp.c @@ -386,6 +386,7 @@ dissect_PNDCP_Suboption_IP(tvbuff_t *tvb, int offset, packet_info *pinfo, guint16 block_qualifier; guint32 ip; proto_item *item = NULL; + address addr; /* SuboptionIPParameter */ @@ -434,15 +435,18 @@ dissect_PNDCP_Suboption_IP(tvbuff_t *tvb, int offset, packet_info *pinfo, /* IPAddress */ offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_ip, &ip); - proto_item_append_text(block_item, ", IP: %s", ip_to_str((guint8*)&ip)); + SET_ADDRESS(&addr, AT_IPv4, 4, &ip); + proto_item_append_text(block_item, ", IP: %s", address_to_str(wmem_packet_scope(), &addr)); /* Subnetmask */ offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_subnetmask, &ip); - proto_item_append_text(block_item, ", Subnet: %s", ip_to_str((guint8*)&ip)); + SET_ADDRESS(&addr, AT_IPv4, 4, &ip); + proto_item_append_text(block_item, ", Subnet: %s", address_to_str(wmem_packet_scope(), &addr)); /* StandardGateway */ offset = dissect_pn_ipv4(tvb, offset, pinfo, tree, hf_pn_dcp_suboption_ip_standard_gateway, &ip); - proto_item_append_text(block_item, ", Gateway: %s", ip_to_str((guint8*)&ip)); + SET_ADDRESS(&addr, AT_IPv4, 4, &ip); + proto_item_append_text(block_item, ", Gateway: %s", address_to_str(wmem_packet_scope(), &addr)); break; default: offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, block_length); |