diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-12-19 21:42:14 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-12-21 15:13:30 +0000 |
| commit | f002332d88a8253cb823cffe82bcedcf4ac196a4 (patch) | |
| tree | 188434acdbcb2d7f1843e19ebc69bc1af94b7e18 /epan/dissectors/packet-ans.c | |
| parent | cdaa6698297a9e14ae9b321f0c6ee536afa917b6 (diff) | |
Replace ether_to_str with either address_to_str or tvb_ether_to_str.
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260
Reviewed-on: https://code.wireshark.org/review/5933
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ans.c')
| -rw-r--r-- | epan/dissectors/packet-ans.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index ce00f1daec..14edd0870c 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -70,16 +70,17 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ans_tree = NULL; guint16 sender_id; guint32 seq_num; - guint8 team_id[6]; + address team_id; col_set_str(pinfo->cinfo, COL_PROTOCOL, "Intel ANS probe"); seq_num = tvb_get_ntohl(tvb, 4); sender_id = tvb_get_ntohs(tvb, 8); - tvb_memcpy(tvb, team_id, 10, 6); + + SET_ADDRESS(&team_id, AT_ETHER, 6, tvb_get_ptr(tvb, 10, 6)); col_add_fstr(pinfo->cinfo, COL_INFO, "Sequence: %u, Sender ID %u, Team ID %s", - seq_num, sender_id, ether_to_str(team_id)); + seq_num, sender_id, address_to_str(wmem_packet_scope(), &team_id)); if (tree) { ti = proto_tree_add_item(tree, proto_ans, tvb, 0, -1, ENC_NA); |