diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-02-12 19:51:11 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-02-21 15:33:56 +0000 |
| commit | 13531d36fb91f3abbd6e62add83faf863e62d974 (patch) | |
| tree | 4f31d03273b57468e8f47d9a8f7f649ef3c42082 /epan/dissectors/packet-ip.c | |
| parent | c1b672cf23dc2f3e55dc37e84099240932953806 (diff) | |
Convert dissectors to use address_with_resolution_to_str instead of two separate calls for address string and name resolution.
Change-Id: I7c8cfbcf201b3b73afe731302572646ce7833d64
Reviewed-on: https://code.wireshark.org/review/7284
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 46f3d0cd44..ffef10eb05 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2232,8 +2232,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) memcpy(&addr, iph->ip_src.data, 4); src_host = get_hostname(addr); if (ip_summary_in_tree) { - proto_item_append_text(ti, ", Src: %s (%s)", src_host, - address_to_str(wmem_packet_scope(), &iph->ip_src)); + proto_item_append_text(ti, ", Src: %s", address_with_resolution_to_str(wmem_packet_scope(), &iph->ip_src)); } proto_tree_add_ipv4(ip_tree, hf_ip_src, tvb, offset + 12, 4, addr); item = proto_tree_add_ipv4(ip_tree, hf_ip_addr, tvb, offset + 12, 4, addr); @@ -2296,8 +2295,7 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) memcpy(&addr, iph->ip_dst.data, 4); dst_host = get_hostname(addr); if (ip_summary_in_tree) { - proto_item_append_text(ti, ", Dst: %s (%s)", dst_host, - address_to_str(wmem_packet_scope(), &iph->ip_dst)); + proto_item_append_text(ti, ", Dst: %s", address_with_resolution_to_str(wmem_packet_scope(), &iph->ip_dst)); } if (dst_off) { |