diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-26 11:28:25 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-26 18:29:08 +0000 |
| commit | 78adf178505295765111caf1107f5d8c9d6ce8ea (patch) | |
| tree | 0e3e773fb0b6fc39bed57c8b28aad2352d50325c /wiretap/peektagged.c | |
| parent | 51d2eefc9532094f385b604c692ef24f09706f64 (diff) | |
Fix handling of 11ac radio metadata.
Add more fields to the metadata to handle everything radiotap has, and
show them.
Call the FEC type field just "FEC", and have it be an integer field with
0 meaning BCC and 1 meaning LDPC, rather than a Boolean.
11ac doesn't have *an* MCS, it can have up to 4, one per user.
Label the 11ac bandwidth values the same way we do in the radiotap
dissector.
Change-Id: I2c2415baff3e5d68d49dda497980e8271d26b1f6
Reviewed-on: https://code.wireshark.org/review/9176
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/peektagged.c')
| -rw-r--r-- | wiretap/peektagged.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index e1844ed034..c6b2d357f3 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -739,11 +739,12 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, case WTAP_ENCAP_IEEE_802_11_WITH_RADIO: if (saw_data_rate_or_mcs_index) { if (ext_flags & EXT_FLAG_MCS_INDEX_USED) { - /* It's an MCS index. */ - if (ext_flags & EXT_FLAG_802_11ac) { - ieee_802_11.phy_info.info_11ac.presence_flags |= PHDR_802_11AC_HAS_MCS_INDEX; - ieee_802_11.phy_info.info_11ac.mcs_index = data_rate_or_mcs_index; - } else { + /* + * It's an MCS index. + * + * XXX - what about 11ac? + */ + if (!(ext_flags & EXT_FLAG_802_11ac)) { ieee_802_11.phy_info.info_11n.presence_flags |= PHDR_802_11N_HAS_MCS_INDEX; ieee_802_11.phy_info.info_11n.mcs_index = data_rate_or_mcs_index; } |