diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-28 23:55:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-29 07:56:28 +0000 |
| commit | 72a9a439338f07522571b69656df9a7066930d74 (patch) | |
| tree | 75a2e95ac8e0f263d9000c9df1ded3b78a06081b /epan/dissectors/packet-ieee80211-radiotap.c | |
| parent | 0450cfa50f7c43e873ee3fe96a437960510c696b (diff) | |
Add A-MPDU reassembly information to the radio metadata.
Change-Id: I338e7fb60ff62d1d26ca0b32468ada4294d52d8d
Reviewed-on: https://code.wireshark.org/review/13594
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee80211-radiotap.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radiotap.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c index 5c3fb011bf..4668b6e61e 100644 --- a/epan/dissectors/packet-ieee80211-radiotap.c +++ b/epan/dissectors/packet-ieee80211-radiotap.c @@ -1492,7 +1492,15 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u proto_tree *ampdu_tree = NULL, *ampdu_flags_tree; guint16 ampdu_flags; + phdr.has_aggregate_info = 1; + phdr.aggregate_flags = 0; + phdr.aggregate_id = tvb_get_letohl(tvb, offset); + ampdu_flags = tvb_get_letohs(tvb, offset + 4); + if (ampdu_flags & IEEE80211_RADIOTAP_AMPDU_IS_LAST) + phdr.aggregate_flags |= PHDR_802_11_LAST_PART_OF_A_MPDU; + if (ampdu_flags & IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR) + phdr.aggregate_flags |= PHDR_802_11_A_MPDU_DELIM_CRC_ERROR; if (tree) { it = proto_tree_add_item(radiotap_tree, hf_radiotap_ampdu, |