diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2018-12-02 18:18:22 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-02 22:58:06 +0000 |
| commit | 850af6011a6186e5007cf44b5ffedbe8588e05ba (patch) | |
| tree | f84a469c5d532cc20bc329eb779d1293495f85ce | |
| parent | bbad3e1870809ed4b895ecbb7ea840aab9d7a570 (diff) | |
nl80211: dissect the mac attribute as address
use an hf variable of type FT_ADDR
Change-Id: Ice88965825d05ee10825b1a7dc91475ffaa75cb2
Reviewed-on: https://code.wireshark.org/review/30890
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-netlink-nl80211.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-netlink-nl80211.c b/epan/dissectors/packet-netlink-nl80211.c index 5710b432dc..1650b402c5 100644 --- a/epan/dissectors/packet-netlink-nl80211.c +++ b/epan/dissectors/packet-netlink-nl80211.c @@ -2494,6 +2494,10 @@ static header_field_info hfi_nl80211_ifname NETLINK_NL80211_HFI_INIT = { "Interface Name", "nl80211.ifname", FT_STRINGZ, STR_ASCII, NULL, 0x00, NULL, HFILL }; +static header_field_info hfi_nl80211_mac NETLINK_NL80211_HFI_INIT = + { "MAC address", "nl80211.mac", FT_ETHER, BASE_NONE, + NULL, 0x00, NULL, HFILL }; + static int dissect_nl80211_generic(tvbuff_t *tvb, void *data, proto_tree *tree, _U_ int nla_type, int offset, int len) { @@ -2764,6 +2768,7 @@ dissect_nl80211_attrs(tvbuff_t *tvb, void *data, proto_tree *tree, int nla_type, { WS_NL80211_ATTR_WIPHY_CHANNEL_TYPE, &hfi_nl80211_channel_type, NULL, NULL }, { WS_NL80211_ATTR_IFNAME, &hfi_nl80211_ifname, NULL, NULL }, { WS_NL80211_ATTR_IFTYPE, &hfi_nl80211_iftype, NULL, NULL }, + { WS_NL80211_ATTR_MAC, &hfi_nl80211_mac, NULL, NULL }, { WS_NL80211_ATTR_STA_PLINK_ACTION, &hfi_plink_actions, NULL, NULL }, { WS_NL80211_ATTR_MPATH_INFO, &hfi_nl80211_mpath_info, NULL, NULL }, { WS_NL80211_ATTR_REG_INITIATOR, &hfi_nl80211_reg_initiator, NULL, NULL }, @@ -2854,6 +2859,7 @@ proto_register_netlink_nl80211(void) &hfi_nl80211_attr_value16, &hfi_nl80211_attr_value32, &hfi_nl80211_ifname, + &hfi_nl80211_mac, /* Extracted using tools/generate-nl80211-fields.py */ /* Definitions from linux/nl80211.h {{{ */ &hfi_nl80211_commands, |