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-eth.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-eth.c')
| -rw-r--r-- | epan/dissectors/packet-eth.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index fb98f9b4f4..13d44df877 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -378,9 +378,9 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, "Ethernet Unknown: Invalid length/type: 0x%04x (%d)", ehdr->type, ehdr->type); ti = proto_tree_add_protocol_format(tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, - "Ethernet Unknown, Src: %s (%s), Dst: %s (%s)", - src_addr_name, address_to_str(wmem_packet_scope(), &pinfo->src), - dst_addr_name, address_to_str(wmem_packet_scope(), &pinfo->dst)); + "Ethernet Unknown, Src: %s, Dst: %s", + address_with_resolution_to_str(wmem_packet_scope(), &pinfo->src), + address_with_resolution_to_str(wmem_packet_scope(), &pinfo->dst)); fh_tree = proto_item_add_subtree(ti, ett_ether); addr_item = proto_tree_add_ether(fh_tree, hf_eth_dst, tvb, 0, 6, dst_addr); if (addr_item) @@ -489,9 +489,9 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, if (parent_tree) { if (PTREE_DATA(parent_tree)->visible) { ti = proto_tree_add_protocol_format(parent_tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, - "Ethernet II, Src: %s (%s), Dst: %s (%s)", - src_addr_name, address_to_str(wmem_packet_scope(), &pinfo->src), - dst_addr_name, address_to_str(wmem_packet_scope(), &pinfo->dst)); + "Ethernet II, Src: %s, Dst: %s", + address_with_resolution_to_str(wmem_packet_scope(), &pinfo->src), + address_with_resolution_to_str(wmem_packet_scope(), &pinfo->dst)); } else { ti = proto_tree_add_item(parent_tree, proto_eth, tvb, 0, ETH_HEADER_SIZE, ENC_NA); |