osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2011-12-14 05:23:57 +00:00
parent 343e983384
commit 44b29ee2ef
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-hpteam.c
View File

@ -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);