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

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
This commit is contained in:
Alexis La Goutte 2012-12-16 15:34:23 +00:00
parent 4c58eabc9a
commit 553f751e01
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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