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-wol.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-wol.c')
| -rw-r--r-- | epan/dissectors/packet-wol.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index a1ecb537bb..a0639e3120 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -168,8 +168,8 @@ dissect_wol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data */ SET_ADDRESS(&mac_addr, AT_ETHER, 6, mac); - col_add_fstr(pinfo->cinfo, COL_INFO, "MagicPacket for %s (%s)", - get_ether_name(mac), address_to_str(wmem_packet_scope(), &mac_addr)); + col_add_fstr(pinfo->cinfo, COL_INFO, "MagicPacket for %s", + address_with_resolution_to_str(wmem_packet_scope(), &mac_addr)); /* NOTE: ether-wake uses a dotted-decimal format for specifying a * 4-byte password or an Ethernet mac address format for specifying @@ -228,8 +228,8 @@ dissect_wol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* create display subtree for the protocol */ ti = proto_tree_add_item(tree, proto_wol, tvb, 0, len, ENC_NA); - proto_item_append_text(ti, ", MAC: %s (%s)", get_ether_name(mac), - address_to_str(wmem_packet_scope(), &mac_addr)); + proto_item_append_text(ti, ", MAC: %s", + address_with_resolution_to_str(wmem_packet_scope(), &mac_addr)); if ( passwd ) proto_item_append_text(ti, ", password: %s", passwd); wol_tree = proto_item_add_subtree(ti, ett_wol); @@ -239,8 +239,8 @@ dissect_wol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* Continue adding tree items to process the packet here */ mac_tree = proto_tree_add_subtree_format(wol_tree, tvb, 6, 96, - ett_wol_macblock, NULL, "MAC: %s (%s)", - get_ether_name(mac), address_to_str(wmem_packet_scope(), &mac_addr)); + ett_wol_macblock, NULL, "MAC: %s", + address_with_resolution_to_str(wmem_packet_scope(), &mac_addr)); for ( offset = 6; offset < 102; offset += 6 ) proto_tree_add_ether(mac_tree, hf_wol_mac, tvb, offset, 6, mac); |