diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-12-16 15:34:23 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-12-16 15:34:23 +0000 |
| commit | 553f751e018fadb4e671e9af5c610d4aae57dbcb (patch) | |
| tree | 28f9eb5ff6dcdb540ae68eeca2b8bb048e3a23d9 /epan | |
| parent | 4c58eabc9af9d9010b0ad3297e201ceb442d99a8 (diff) | |
From Simon Barber via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8094 Add support for RA and TA to all 802.11 frame formats
svn path=/trunk/; revision=46561
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 3f7811d9be..af2b6174ab 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -11469,8 +11469,10 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, if (tree) { + proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, dst); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, dst); + proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, src); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, src); proto_tree_add_item (hdr_tree, hf_ieee80211_addr_bssid, tvb, 16, 6, ENC_NA); @@ -11843,7 +11845,9 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, { case DATA_ADDR_T1: + proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, ENC_NA); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, dst); + proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, ENC_NA); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, src); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_bssid, tvb, 16, 6, bssid); proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, @@ -11861,7 +11865,9 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, break; case DATA_ADDR_T2: + proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, ENC_NA); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 4, 6, dst); + proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, ENC_NA); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_bssid, tvb, 10, 6, bssid); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 16, 6, src); proto_tree_add_uint (hdr_tree, hf_ieee80211_frag_number, tvb, 22, 2, @@ -11879,7 +11885,9 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, break; case DATA_ADDR_T3: + proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ra, tvb, 4, 6, ENC_NA); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, bssid); + proto_tree_add_item (hdr_tree, hf_ieee80211_addr_ta, tvb, 10, 6, ENC_NA); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_sa, tvb, 10, 6, src); proto_tree_add_ether (hdr_tree, hf_ieee80211_addr_da, tvb, 16, 6, dst); |