aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-hpteam.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-12-14 05:23:57 +0000
committerGuy Harris <guy@alum.mit.edu>2011-12-14 05:23:57 +0000
commit44b29ee2efc1421c8546c1f07cfac08244702adc (patch)
tree229efa48f31768828170181744724aab0b293baf /epan/dissectors/packet-hpteam.c
parent343e983384b78e3eb436c94a25effad660ec817d (diff)
Put back the source MAC address, but do it right, in one column_add_fstr()
call, and using ep_address_to_str(), so it can handle any address type, including AT_NONE if the source address isn't available. svn path=/trunk/; revision=40196
Diffstat (limited to 'epan/dissectors/packet-hpteam.c')
-rw-r--r--epan/dissectors/packet-hpteam.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/epan/dissectors/packet-hpteam.c b/epan/dissectors/packet-hpteam.c
index d514e43992..e03bc51dc7 100644
--- a/epan/dissectors/packet-hpteam.c
+++ b/epan/dissectors/packet-hpteam.c
@@ -96,13 +96,9 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
proto_tree *hpteam_tree;
guint32 offset = 0;
- /*
- * No need to show the source MAC address; there's no 100%
- * guarantee that it's there, and it should show up in
- * the source address column by default.
- */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP NIC Team");
- col_set_str(pinfo->cinfo, COL_INFO, "HP NIC Teaming Heartbeat");
+ col_add_fstr(pinfo->cinfo, COL_INFO, "HP NIC Teaming Heartbeat; Port MAC = %s",
+ ep_address_to_str(&pinfo->dl_src));
if (tree) { /* we are being asked for details */
hpteam_item = proto_tree_add_item(tree, proto_hpteam, tvb, 0, -1, ENC_NA);